Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
xen: fix address truncation in pte mfn<->pfn conversion
arch/x86/mm/init_64.c: early_memtest(): fix types
x86: fix Intel Mac booting with EFI
+10
-9
+4
-4
arch/x86/kernel/efi_32.c
+4
-4
arch/x86/kernel/efi_32.c
···
49
49
local_irq_save(efi_rt_eflags);
50
50
51
51
/*
52
-
* If I don't have PSE, I should just duplicate two entries in page
53
-
* directory. If I have PSE, I just need to duplicate one entry in
52
+
* If I don't have PAE, I should just duplicate two entries in page
53
+
* directory. If I have PAE, I just need to duplicate one entry in
54
54
* page directory.
55
55
*/
56
56
cr4 = read_cr4();
57
57
58
-
if (cr4 & X86_CR4_PSE) {
58
+
if (cr4 & X86_CR4_PAE) {
59
59
efi_bak_pg_dir_pointer[0].pgd =
60
60
swapper_pg_dir[pgd_index(0)].pgd;
61
61
swapper_pg_dir[0].pgd =
···
93
93
94
94
cr4 = read_cr4();
95
95
96
-
if (cr4 & X86_CR4_PSE) {
96
+
if (cr4 & X86_CR4_PAE) {
97
97
swapper_pg_dir[pgd_index(0)].pgd =
98
98
efi_bak_pg_dir_pointer[0].pgd;
99
99
} else {
+4
-3
arch/x86/mm/init_64.c
+4
-3
arch/x86/mm/init_64.c
···
506
506
507
507
static void __init early_memtest(unsigned long start, unsigned long end)
508
508
{
509
-
unsigned long t_start, t_size;
509
+
u64 t_start, t_size;
510
510
unsigned pattern;
511
511
512
512
if (!memtest_pattern)
···
525
525
if (t_start + t_size > end)
526
526
t_size = end - t_start;
527
527
528
-
printk(KERN_CONT "\n %016lx - %016lx pattern %d",
529
-
t_start, t_start + t_size, pattern);
528
+
printk(KERN_CONT "\n %016llx - %016llx pattern %d",
529
+
(unsigned long long)t_start,
530
+
(unsigned long long)t_start + t_size, pattern);
530
531
531
532
memtest(t_start, t_size, pattern);
532
533
+2
-2
arch/x86/xen/mmu.c
+2
-2
arch/x86/xen/mmu.c
···
185
185
if (val & _PAGE_PRESENT) {
186
186
unsigned long mfn = (val & PTE_MASK) >> PAGE_SHIFT;
187
187
pteval_t flags = val & ~PTE_MASK;
188
-
val = (mfn_to_pfn(mfn) << PAGE_SHIFT) | flags;
188
+
val = ((pteval_t)mfn_to_pfn(mfn) << PAGE_SHIFT) | flags;
189
189
}
190
190
191
191
return val;
···
196
196
if (val & _PAGE_PRESENT) {
197
197
unsigned long pfn = (val & PTE_MASK) >> PAGE_SHIFT;
198
198
pteval_t flags = val & ~PTE_MASK;
199
-
val = (pfn_to_mfn(pfn) << PAGE_SHIFT) | flags;
199
+
val = ((pteval_t)pfn_to_mfn(pfn) << PAGE_SHIFT) | flags;
200
200
}
201
201
202
202
return val;