diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /arch/x86_64/kernel/head.S | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'arch/x86_64/kernel/head.S')
| -rw-r--r-- | arch/x86_64/kernel/head.S | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S index 4592bf21fcaf..b92e5f45ed46 100644 --- a/arch/x86_64/kernel/head.S +++ b/arch/x86_64/kernel/head.S | |||
| @@ -270,26 +270,26 @@ ENTRY(level3_kernel_pgt) | |||
| 270 | .org 0x4000 | 270 | .org 0x4000 |
| 271 | ENTRY(level2_ident_pgt) | 271 | ENTRY(level2_ident_pgt) |
| 272 | /* 40MB for bootup. */ | 272 | /* 40MB for bootup. */ |
| 273 | .quad 0x0000000000000183 | 273 | .quad 0x0000000000000083 |
| 274 | .quad 0x0000000000200183 | 274 | .quad 0x0000000000200083 |
| 275 | .quad 0x0000000000400183 | 275 | .quad 0x0000000000400083 |
| 276 | .quad 0x0000000000600183 | 276 | .quad 0x0000000000600083 |
| 277 | .quad 0x0000000000800183 | 277 | .quad 0x0000000000800083 |
| 278 | .quad 0x0000000000A00183 | 278 | .quad 0x0000000000A00083 |
| 279 | .quad 0x0000000000C00183 | 279 | .quad 0x0000000000C00083 |
| 280 | .quad 0x0000000000E00183 | 280 | .quad 0x0000000000E00083 |
| 281 | .quad 0x0000000001000183 | 281 | .quad 0x0000000001000083 |
| 282 | .quad 0x0000000001200183 | 282 | .quad 0x0000000001200083 |
| 283 | .quad 0x0000000001400183 | 283 | .quad 0x0000000001400083 |
| 284 | .quad 0x0000000001600183 | 284 | .quad 0x0000000001600083 |
| 285 | .quad 0x0000000001800183 | 285 | .quad 0x0000000001800083 |
| 286 | .quad 0x0000000001A00183 | 286 | .quad 0x0000000001A00083 |
| 287 | .quad 0x0000000001C00183 | 287 | .quad 0x0000000001C00083 |
| 288 | .quad 0x0000000001E00183 | 288 | .quad 0x0000000001E00083 |
| 289 | .quad 0x0000000002000183 | 289 | .quad 0x0000000002000083 |
| 290 | .quad 0x0000000002200183 | 290 | .quad 0x0000000002200083 |
| 291 | .quad 0x0000000002400183 | 291 | .quad 0x0000000002400083 |
| 292 | .quad 0x0000000002600183 | 292 | .quad 0x0000000002600083 |
| 293 | /* Temporary mappings for the super early allocator in arch/x86_64/mm/init.c */ | 293 | /* Temporary mappings for the super early allocator in arch/x86_64/mm/init.c */ |
| 294 | .globl temp_boot_pmds | 294 | .globl temp_boot_pmds |
| 295 | temp_boot_pmds: | 295 | temp_boot_pmds: |