fix ksm.h breakage of nommu build
authorHugh Dickins <hugh.dickins@tiscali.co.uk>
Wed, 16 Dec 2009 08:56:57 +0000 (08:56 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Dec 2009 14:56:12 +0000 (06:56 -0800)
commitf42647acc4eab1befa9e290691ed7a40f9a7d3cc
treeb2ced9ee524f8db99ca2ed64d181e0860a60ff94
parent8bea8672edfca7ec5f661cafb218f1205863b343
fix ksm.h breakage of nommu build

Commit 5ad6468801d28c4d4ac9f48ec19297817c915f6a "ksm: let shared pages
be swappable" breaks the build on m68knommu and I suspect on any nommu:

  In file included from kernel/fork.c:52:
  include/linux/ksm.h:129: warning: 'enum ttu_flags' declared inside parameter list
  include/linux/ksm.h:129: warning: its scope is only this definition or declaration, which is probably not what you want
  include/linux/ksm.h:129: error: parameter 2 ('flags') has incomplete type
  make[1]: *** [kernel/fork.o] Error 1
  make[1]: *** Waiting for unfinished jobs....

Let's fix that with CONFIG_MMU around most of the !CONFIG_KSM declarations.

Reported-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Tested-by: Steven King <sfking@fdwdc.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/ksm.h