[PATCH] Update the alignment for 4K stacks.

[PATCH] Update the alignment for 4K stacks.

[Robert P. J. Day]

Just following the advice in the comments, update the alignment when
4K stacks are selected, since gcc 3.0 shouldn't be an issue anymore.

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

---

 arch/i386/kernel/irq.c |    8 ++------
 arch/sh/kernel/irq.c   |    8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c
index d2daf67..504f134 100644
--- a/arch/i386/kernel/irq.c
+++ b/arch/i386/kernel/irq.c
@@ -149,15 +149,11 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)

 #ifdef CONFIG_4KSTACKS

-/*
- * These should really be __section__(".bss.page_aligned") as well, but
- * gcc's 3.0 and earlier don't handle that correctly.
- */
 static char softirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__aligned__(THREAD_SIZE)));
+		__attribute__((__section__(".bss.page_aligned")));

 static char hardirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__aligned__(THREAD_SIZE)));
+		__attribute__((__section__(".bss.page_aligned")));

 /*
  * allocate per-cpu stacks for hardirq and for softirq processing
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 27b923c..2789779 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -158,15 +158,11 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
 }

 #ifdef CONFIG_4KSTACKS
-/*
- * These should really be __section__(".bss.page_aligned") as well, but
- * gcc's 3.0 and earlier don't handle that correctly.
- */
 static char softirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__aligned__(THREAD_SIZE)));
+		__attribute__((__section__(".bss.page_aligned")));

 static char hardirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__aligned__(THREAD_SIZE)));
+		__attribute__((__section__(".bss.page_aligned")));

 /*
  * allocate per-cpu stacks for hardirq and for softirq processing
diff --git a/include/asm-blackfin/macros.h b/include/asm-blackfin/macros.h
deleted file mode 100644
index e69de29..0000000
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================

Re: [PATCH] Update the alignment for 4K stacks.

[Andrew Morton]

On Sun, 24 Jun 2007 15:21:37 -0400 (EDT) "Robert P. J. Day" <rpjday@mindspring.com> wrote:

>  arch/i386/kernel/irq.c |    8 ++------
>  arch/sh/kernel/irq.c   |    8 ++------

These two files are maintained by different developers who run
separate development trees.  Please do not try to alter them
both in the same patch.

Re: [PATCH] Update the alignment for 4K stacks.

[Robert P. J. Day]

On Sun, 24 Jun 2007, Andrew Morton wrote:

> On Sun, 24 Jun 2007 15:21:37 -0400 (EDT) "Robert P. J. Day" <rpjday@mindspring.com> wrote:
>
> >  arch/i386/kernel/irq.c |    8 ++------
> >  arch/sh/kernel/irq.c   |    8 ++------
>
> These two files are maintained by different developers who run
> separate development trees.  Please do not try to alter them
> both in the same patch.

ok, i'll split them.

rday
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://fsdev.net/wiki/index.php?title=Main_Page
========================================================================