diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2011-12-29 15:04:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-29 23:58:31 +0100 |
| commit | a4b4f4371b94552973109f6b9ebe6af7a9efa0bd (patch) | |
| tree | 1a5404b34c2e547ab6a9f8aa7a940d5b9c54e163 /arch | |
| parent | sparc32: enable different preemptions models (diff) | |
| download | linux-a4b4f4371b94552973109f6b9ebe6af7a9efa0bd.tar.xz linux-a4b4f4371b94552973109f6b9ebe6af7a9efa0bd.zip | |
sparc32: fix PAGE_SIZE definition
Use _AC() in definition of PAGE_SIZE so the same definition
can be used in C and assembler.
Also use PAGE_SIZE in definition of THREAD_SIZE.
This commit kill the following comment:
"I have my suspicions... -DaveM"
I did not find any clue what this referred to anyway.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/page_32.h | 10 | ||||
| -rw-r--r-- | arch/sparc/include/asm/thread_info_32.h | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h index 156707b0f18d..bb5c2ac4055d 100644 --- a/arch/sparc/include/asm/page_32.h +++ b/arch/sparc/include/asm/page_32.h @@ -8,14 +8,10 @@ #ifndef _SPARC_PAGE_H #define _SPARC_PAGE_H -#define PAGE_SHIFT 12 +#include <linux/const.h> -#ifndef __ASSEMBLY__ -/* I have my suspicions... -DaveM */ -#define PAGE_SIZE (1UL << PAGE_SHIFT) -#else -#define PAGE_SIZE (1 << PAGE_SHIFT) -#endif +#define PAGE_SHIFT 12 +#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) #include <asm/btfixup.h> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index fa5753233410..e41869087b70 100644 --- a/arch/sparc/include/asm/thread_info_32.h +++ b/arch/sparc/include/asm/thread_info_32.h @@ -95,7 +95,7 @@ BTFIXUPDEF_CALL(void, free_thread_info, struct thread_info *) * Observe the order of get_free_pages() in alloc_thread_info_node(). * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste. */ -#define THREAD_SIZE 8192 +#define THREAD_SIZE (2 * PAGE_SIZE) /* * Offsets in thread_info structure, used in assembly code |