diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /arch/powerpc/kernel/head_32.S | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/kernel/head_32.S')
| -rw-r--r-- | arch/powerpc/kernel/head_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index a5b13ae7fd20..0f4fac512020 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S | |||
| @@ -1311,7 +1311,7 @@ empty_zero_page: | |||
| 1311 | 1311 | ||
| 1312 | .globl swapper_pg_dir | 1312 | .globl swapper_pg_dir |
| 1313 | swapper_pg_dir: | 1313 | swapper_pg_dir: |
| 1314 | .space 4096 | 1314 | .space PGD_TABLE_SIZE |
| 1315 | 1315 | ||
| 1316 | .globl intercept_table | 1316 | .globl intercept_table |
| 1317 | intercept_table: | 1317 | intercept_table: |