diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-29 20:16:50 -0400 |
| commit | e9a4b6a3f6592862a67837e80aad3f50468857a6 (patch) | |
| tree | 087420cf91ac922c7e99757c4490a605ec7b10f2 /arch/parisc/kernel/head.S | |
| parent | 441dbb500b4344a8e3125e5aabab4f9dbf72514f (diff) | |
| parent | 1702b52092e9a6d05398d3f9581ddc050ef00d06 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/parisc/kernel/head.S')
| -rw-r--r-- | arch/parisc/kernel/head.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 5680a2c3b13d..a84e31e82876 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S | |||
| @@ -33,6 +33,7 @@ ENTRY(boot_args) | |||
| 33 | END(boot_args) | 33 | END(boot_args) |
| 34 | 34 | ||
| 35 | __HEAD | 35 | __HEAD |
| 36 | |||
| 36 | .align 4 | 37 | .align 4 |
| 37 | .import init_thread_union,data | 38 | .import init_thread_union,data |
| 38 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ | 39 | .import fault_vector_20,code /* IVA parisc 2.0 32 bit */ |