diff options
author | Chris Metcalf <cmetcalf@tilera.com> | 2011-02-27 18:52:24 -0500 |
---|---|---|
committer | Chris Metcalf <cmetcalf@tilera.com> | 2011-03-01 16:18:52 -0500 |
commit | 2cb82400719e085a3c226cf7cce8950208f09a06 (patch) | |
tree | f37f00fb93625da933d271d4260a3ea4e7ec9f9c /arch/tile/kernel | |
parent | d356b595e5a95c0c2305ec0a7d1cdb3e26f57716 (diff) |
arch/tile: catch up with section naming convention in 2.6.35
The convention changed to, e.g., ".data..page_aligned". This commit
fixes the places in the tile architecture that were still using the
old convention. One tile-specific section (.init.page) was dropped
in favor of just using an "aligned" attribute.
Sam Ravnborg <sam@ravnborg.org> pointed out __PAGE_ALIGNED_BSS, etc.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r-- | arch/tile/kernel/head_32.S | 4 | ||||
-rw-r--r-- | arch/tile/kernel/vmlinux.lds.S | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/arch/tile/kernel/head_32.S b/arch/tile/kernel/head_32.S index 90e7c4435693..05b5f4d54d91 100644 --- a/arch/tile/kernel/head_32.S +++ b/arch/tile/kernel/head_32.S | |||
@@ -133,7 +133,7 @@ ENTRY(_start) | |||
133 | } | 133 | } |
134 | ENDPROC(_start) | 134 | ENDPROC(_start) |
135 | 135 | ||
136 | .section ".bss.page_aligned","w" | 136 | __PAGE_ALIGNED_BSS |
137 | .align PAGE_SIZE | 137 | .align PAGE_SIZE |
138 | ENTRY(empty_zero_page) | 138 | ENTRY(empty_zero_page) |
139 | .fill PAGE_SIZE,1,0 | 139 | .fill PAGE_SIZE,1,0 |
@@ -148,7 +148,7 @@ ENTRY(empty_zero_page) | |||
148 | .word (\bits1) | (HV_CPA_TO_PFN(\cpa) << HV_PTE_INDEX_PFN) | 148 | .word (\bits1) | (HV_CPA_TO_PFN(\cpa) << HV_PTE_INDEX_PFN) |
149 | .endm | 149 | .endm |
150 | 150 | ||
151 | .section ".data.page_aligned","wa" | 151 | __PAGE_ALIGNED_DATA |
152 | .align PAGE_SIZE | 152 | .align PAGE_SIZE |
153 | ENTRY(swapper_pg_dir) | 153 | ENTRY(swapper_pg_dir) |
154 | /* | 154 | /* |
diff --git a/arch/tile/kernel/vmlinux.lds.S b/arch/tile/kernel/vmlinux.lds.S index 25fdc0c1839a..4e211c1bf500 100644 --- a/arch/tile/kernel/vmlinux.lds.S +++ b/arch/tile/kernel/vmlinux.lds.S | |||
@@ -59,10 +59,7 @@ SECTIONS | |||
59 | 59 | ||
60 | . = ALIGN(PAGE_SIZE); | 60 | . = ALIGN(PAGE_SIZE); |
61 | VMLINUX_SYMBOL(_sinitdata) = .; | 61 | VMLINUX_SYMBOL(_sinitdata) = .; |
62 | .init.page : AT (ADDR(.init.page) - LOAD_OFFSET) { | 62 | INIT_DATA_SECTION(16) :data =0 |
63 | *(.init.page) | ||
64 | } :data =0 | ||
65 | INIT_DATA_SECTION(16) | ||
66 | PERCPU(PAGE_SIZE) | 63 | PERCPU(PAGE_SIZE) |
67 | . = ALIGN(PAGE_SIZE); | 64 | . = ALIGN(PAGE_SIZE); |
68 | VMLINUX_SYMBOL(_einitdata) = .; | 65 | VMLINUX_SYMBOL(_einitdata) = .; |