diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/parisc/kernel/vmlinux.lds.S | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'arch/parisc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index fda4baa059b5..9dab4a4e09f7 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
| @@ -78,9 +78,6 @@ SECTIONS | |||
| 78 | */ | 78 | */ |
| 79 | . = ALIGN(PAGE_SIZE); | 79 | . = ALIGN(PAGE_SIZE); |
| 80 | data_start = .; | 80 | data_start = .; |
| 81 | EXCEPTION_TABLE(16) | ||
| 82 | |||
| 83 | NOTES | ||
| 84 | 81 | ||
| 85 | /* unwind info */ | 82 | /* unwind info */ |
| 86 | .PARISC.unwind : { | 83 | .PARISC.unwind : { |
| @@ -89,6 +86,9 @@ SECTIONS | |||
| 89 | __stop___unwind = .; | 86 | __stop___unwind = .; |
| 90 | } | 87 | } |
| 91 | 88 | ||
| 89 | EXCEPTION_TABLE(16) | ||
| 90 | NOTES | ||
| 91 | |||
| 92 | /* Data */ | 92 | /* Data */ |
| 93 | RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) | 93 | RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE) |
| 94 | 94 | ||