diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:47:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:47:06 -0500 |
| commit | 37cfc3f67db9f2d907f6bfcfae590cdbbef623e8 (patch) | |
| tree | b573983938838dd76b40a7b53b3744472041720f /arch/sparc/include/asm/thread_info_32.h | |
| parent | 38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (diff) | |
| parent | 6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
sparc32: remove unused file: include/asm/pgtsun4.h
sparc32: fix PAGE_SIZE definition
sparc32: enable different preemptions models
sparc32: support atomic64_t
apbuart: fix section mismatch warning
sparc32: drop useless preprocessor conditional in atomic_32.h
sparc32: drop unused atomic24 support
Diffstat (limited to 'arch/sparc/include/asm/thread_info_32.h')
| -rw-r--r-- | arch/sparc/include/asm/thread_info_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h index 5cc5888ad5a3..c2a1080cdd3b 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 *) | |||
| 95 | * Observe the order of get_free_pages() in alloc_thread_info_node(). | 95 | * Observe the order of get_free_pages() in alloc_thread_info_node(). |
| 96 | * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste. | 96 | * The sun4 has 8K stack too, because it's short on memory, and 16K is a waste. |
| 97 | */ | 97 | */ |
| 98 | #define THREAD_SIZE 8192 | 98 | #define THREAD_SIZE (2 * PAGE_SIZE) |
| 99 | 99 | ||
| 100 | /* | 100 | /* |
| 101 | * Offsets in thread_info structure, used in assembly code | 101 | * Offsets in thread_info structure, used in assembly code |