]> git.baikalelectronics.ru Git - kernel.git/commit
Fix highmem PPC build failure
authorKumar Gala <galak@kernel.crashing.org>
Thu, 2 Apr 2009 04:38:49 +0000 (23:38 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 16:48:29 +0000 (09:48 -0700)
commit1578e5fdb1e584192b31e82763efffa7d7fadc2a
treed7169ef37071cc14225e7700a4f6c08981f3f5e4
parent12f88969886ce0b2d09dbd21d18470fd1cda082b
Fix highmem PPC build failure

Commit d4d8fc8aca37053c98cb48305deeb0cdaca46f81 ("mm: introduce
debug_kmap_atomic") broke PPC builds with CONFIG_HIGHMEM=y:

   CC      init/main.o
  In file included from include/linux/highmem.h:25,
                   from include/linux/pagemap.h:11,
                   from include/linux/mempolicy.h:63,
                   from init/main.c:53:
  arch/powerpc/include/asm/highmem.h: In function 'kmap_atomic_prot':
  arch/powerpc/include/asm/highmem.h:98: error: implicit declaration of function 'debug_kmap_atomic'
  In file included from include/linux/pagemap.h:11,
                   from include/linux/mempolicy.h:63,
                   from init/main.c:53:
  include/linux/highmem.h: At top level:
  include/linux/highmem.h:196: warning: conflicting types for 'debug_kmap_atomic'
  include/linux/highmem.h:196: error: static declaration of 'debug_kmap_atomic' follows non-static declaration
  include/asm/highmem.h:98: error: previous implicit declaration of 'debug_kmap_atomic' was here
  make[1]: *** [init/main.o] Error 1
  make: *** [init] Error 2

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/highmem.h