Commit 42b35923 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

m68k: Use _AC() instead of #ifdef __ASSEMBLY__

m68k: Use _AC() instead of #ifdef __ASSEMBLY__ hackery when needed, remove
hackery when unused.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0d5e74fc
...@@ -4,17 +4,15 @@ ...@@ -4,17 +4,15 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/const.h>
/* PAGE_SHIFT determines the page size */ /* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
#define PAGE_SHIFT (12) #define PAGE_SHIFT (12)
#else #else
#define PAGE_SHIFT (13) #define PAGE_SHIFT (13)
#endif #endif
#ifdef __ASSEMBLY__ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_SIZE (1 << PAGE_SHIFT)
#else
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#endif
#define PAGE_MASK (~(PAGE_SIZE-1)) #define PAGE_MASK (~(PAGE_SIZE-1))
#include <asm/setup.h> #include <asm/setup.h>
......
...@@ -38,12 +38,8 @@ static inline void wrusp(unsigned long usp) ...@@ -38,12 +38,8 @@ static inline void wrusp(unsigned long usp)
#ifndef CONFIG_SUN3 #ifndef CONFIG_SUN3
#define TASK_SIZE (0xF0000000UL) #define TASK_SIZE (0xF0000000UL)
#else #else
#ifdef __ASSEMBLY__
#define TASK_SIZE (0x0E000000)
#else
#define TASK_SIZE (0x0E000000UL) #define TASK_SIZE (0x0E000000UL)
#endif #endif
#endif
/* This decides where the kernel will search for a free chunk of vm /* This decides where the kernel will search for a free chunk of vm
* space during mmap's. * space during mmap's.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment