Patchwork [2/2] sparc32: fix PAGE_SIZE definition

login
register
mail settings
Submitter Sam Ravnborg
Date Dec. 29, 2011, 2:16 p.m.
Message ID <20111229141612.GB3146@merkur.ravnborg.org>
Download mbox | patch
Permalink /patch/133552/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sam Ravnborg - Dec. 29, 2011, 2:16 p.m.
From 1076481b278bd14617a544cc20520cfd73f9b12c Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 29 Dec 2011 15:04:38 +0100
Subject: [PATCH 2/2] 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>
---
 arch/sparc/include/asm/page_32.h        |   10 +++-------
 arch/sparc/include/asm/thread_info_32.h |    2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)
David Miller - Dec. 29, 2011, 11:14 p.m.
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 29 Dec 2011 15:16:12 +0100

>>From 1076481b278bd14617a544cc20520cfd73f9b12c Mon Sep 17 00:00:00 2001
> From: Sam Ravnborg <sam@ravnborg.org>
> Date: Thu, 29 Dec 2011 15:04:38 +0100
> Subject: [PATCH 2/2] 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>

Applied.

That comment was written by some newbie, ignore him :-)
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
index 156707b..bb5c2ac 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 fa57532..e418690 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