tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

m68k: Use _AC() instead of #ifdef __ASSEMBLY__

m68k: Use _AC() instead of #ifdef __ASSEMBLY__ hackery when needed, remove
hackery when unused.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Geert Uytterhoeven and committed by
Linus Torvalds 42b35923 0d5e74fc

+3 -9
+3 -5
include/asm-m68k/page.h
··· 4 4 5 5 #ifdef __KERNEL__ 6 6 7 + #include <linux/const.h> 8 + 7 9 /* PAGE_SHIFT determines the page size */ 8 10 #ifndef CONFIG_SUN3 9 11 #define PAGE_SHIFT (12) 10 12 #else 11 13 #define PAGE_SHIFT (13) 12 14 #endif 13 - #ifdef __ASSEMBLY__ 14 - #define PAGE_SIZE (1 << PAGE_SHIFT) 15 - #else 16 - #define PAGE_SIZE (1UL << PAGE_SHIFT) 17 - #endif 15 + #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 18 16 #define PAGE_MASK (~(PAGE_SIZE-1)) 19 17 20 18 #include <asm/setup.h>
-4
include/asm-m68k/processor.h
··· 38 38 #ifndef CONFIG_SUN3 39 39 #define TASK_SIZE (0xF0000000UL) 40 40 #else 41 - #ifdef __ASSEMBLY__ 42 - #define TASK_SIZE (0x0E000000) 43 - #else 44 41 #define TASK_SIZE (0x0E000000UL) 45 - #endif 46 42 #endif 47 43 48 44 /* This decides where the kernel will search for a free chunk of vm