From 317f36dfdb9b501adb634fc3b465e84d5712da4c Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Sun, 20 Sep 2009 18:14:14 -0400
Subject: [PATCH] --- yaml --- r: 165583 b: refs/heads/master c:
 02b7da37f7acd49277dea1481dc0c5c246c09732 h: refs/heads/master i:   165581:
 8188f4b2afa274066ea559b8d114baac6271df2e   165579:
 bb8fff96e4912e546f384be307645e47e6cf2d0e   165575:
 741669e0c37a2f495c8b966b079394b980ac7434   165567:
 872d2eb53b0a65dc695bb2f0dd56c2d7c14ab9a1 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sh/kernel/irq.c      | 6 ++----
 trunk/arch/x86/kernel/head_32.S | 2 +-
 trunk/arch/x86/kernel/head_64.S | 2 +-
 trunk/arch/xtensa/kernel/head.S | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f082f87c1c13..06c1b5599b5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d200c922bc2b1ac88b8d33b6cfff2ed837af186a
+refs/heads/master: 02b7da37f7acd49277dea1481dc0c5c246c09732
diff --git a/trunk/arch/sh/kernel/irq.c b/trunk/arch/sh/kernel/irq.c
index 60f8af4497c7..7cb933ba4957 100644
--- a/trunk/arch/sh/kernel/irq.c
+++ b/trunk/arch/sh/kernel/irq.c
@@ -165,11 +165,9 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs)
 }
 
 #ifdef CONFIG_IRQSTACKS
-static char softirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__section__(".bss.page_aligned")));
+static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
 
-static char hardirq_stack[NR_CPUS * THREAD_SIZE]
-		__attribute__((__section__(".bss.page_aligned")));
+static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss;
 
 /*
  * allocate per-cpu stacks for hardirq and for softirq processing
diff --git a/trunk/arch/x86/kernel/head_32.S b/trunk/arch/x86/kernel/head_32.S
index b766e8c7252d..1dac23958427 100644
--- a/trunk/arch/x86/kernel/head_32.S
+++ b/trunk/arch/x86/kernel/head_32.S
@@ -608,7 +608,7 @@ ENTRY(initial_code)
 /*
  * BSS section
  */
-.section ".bss.page_aligned","wa"
+__PAGE_ALIGNED_BSS
 	.align PAGE_SIZE_asm
 #ifdef CONFIG_X86_PAE
 swapper_pg_pmd:
diff --git a/trunk/arch/x86/kernel/head_64.S b/trunk/arch/x86/kernel/head_64.S
index fa54f78e2a05..d0bc0a13a437 100644
--- a/trunk/arch/x86/kernel/head_64.S
+++ b/trunk/arch/x86/kernel/head_64.S
@@ -418,7 +418,7 @@ ENTRY(phys_base)
 ENTRY(idt_table)
 	.skip IDT_ENTRIES * 16
 
-	.section .bss.page_aligned, "aw", @nobits
+	__PAGE_ALIGNED_BSS
 	.align PAGE_SIZE
 ENTRY(empty_zero_page)
 	.skip PAGE_SIZE
diff --git a/trunk/arch/xtensa/kernel/head.S b/trunk/arch/xtensa/kernel/head.S
index d9ddc1ba761c..d215adcfd4ea 100644
--- a/trunk/arch/xtensa/kernel/head.S
+++ b/trunk/arch/xtensa/kernel/head.S
@@ -235,7 +235,7 @@ should_never_return:
  * BSS section
  */
 	
-.section ".bss.page_aligned", "w"
+__PAGE_ALIGNED_BSS
 #ifdef CONFIG_MMU
 ENTRY(swapper_pg_dir)
 	.fill	PAGE_SIZE, 1, 0