Commit cbfa66b8 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-fixes-for-linus' of...

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:
  x86: fix pointer type warning in arch/x86/mm/init_64.c:early_memtest
  x86, lockdep: fix "WARNING: at kernel/lockdep.c:2658 check_flags+0x4c/0x128()"
  x86: fix an incompatible pointer type warning on 64-bit compilations
  x86: fix lockdep warning during suspend-to-ram
  x86: fix unused variable 'loops' warning in arch/x86/boot/a20.c
  Revert "x86: fix ioapic bug again"
  x86: fix asm warning in head_32.S
  x86: fix endless page faults in mount_block_root for Linux 2.6
  geode: fix modular build
parents 1b3cba8e f8a45704
...@@ -115,8 +115,6 @@ static void enable_a20_fast(void) ...@@ -115,8 +115,6 @@ static void enable_a20_fast(void)
int enable_a20(void) int enable_a20(void)
{ {
int loops = A20_ENABLE_LOOPS;
#if defined(CONFIG_X86_ELAN) #if defined(CONFIG_X86_ELAN)
/* Elan croaks if we try to touch the KBC */ /* Elan croaks if we try to touch the KBC */
enable_a20_fast(); enable_a20_fast();
...@@ -128,6 +126,7 @@ int enable_a20(void) ...@@ -128,6 +126,7 @@ int enable_a20(void)
enable_a20_kbc(); enable_a20_kbc();
return 0; return 0;
#else #else
int loops = A20_ENABLE_LOOPS;
while (loops--) { while (loops--) {
/* First, check to see if A20 is already enabled /* First, check to see if A20 is already enabled
(legacy free, etc.) */ (legacy free, etc.) */
......
...@@ -248,6 +248,7 @@ ENTRY(resume_userspace) ...@@ -248,6 +248,7 @@ ENTRY(resume_userspace)
DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt DISABLE_INTERRUPTS(CLBR_ANY) # make sure we don't miss an interrupt
# setting need_resched or sigpending # setting need_resched or sigpending
# between sampling and the iret # between sampling and the iret
TRACE_IRQS_OFF
movl TI_flags(%ebp), %ecx movl TI_flags(%ebp), %ecx
andl $_TIF_WORK_MASK, %ecx # is there any work to be done on andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
# int/exception return? # int/exception return?
......
...@@ -189,7 +189,7 @@ default_entry: ...@@ -189,7 +189,7 @@ default_entry:
* this stage. * this stage.
*/ */
#define KPMDS ((0x100000000-__PAGE_OFFSET) >> 30) /* Number of kernel PMDs */ #define KPMDS (((-__PAGE_OFFSET) >> 30) & 3) /* Number of kernel PMDs */
xorl %ebx,%ebx /* %ebx is kept at zero */ xorl %ebx,%ebx /* %ebx is kept at zero */
......
...@@ -2130,14 +2130,10 @@ static inline void __init check_timer(void) ...@@ -2130,14 +2130,10 @@ static inline void __init check_timer(void)
{ {
int apic1, pin1, apic2, pin2; int apic1, pin1, apic2, pin2;
int vector; int vector;
unsigned int ver;
unsigned long flags; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
ver = apic_read(APIC_LVR);
ver = GET_APIC_VERSION(ver);
/* /*
* get/set the timer IRQ vector: * get/set the timer IRQ vector:
*/ */
...@@ -2150,15 +2146,11 @@ static inline void __init check_timer(void) ...@@ -2150,15 +2146,11 @@ static inline void __init check_timer(void)
* mode for the 8259A whenever interrupts are routed * mode for the 8259A whenever interrupts are routed
* through I/O APICs. Also IRQ0 has to be enabled in * through I/O APICs. Also IRQ0 has to be enabled in
* the 8259A which implies the virtual wire has to be * the 8259A which implies the virtual wire has to be
* disabled in the local APIC. Finally timer interrupts * disabled in the local APIC.
* need to be acknowledged manually in the 8259A for
* timer_interrupt() and for the i82489DX when using
* the NMI watchdog.
*/ */
apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); apic_write_around(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT);
init_8259A(1); init_8259A(1);
timer_ack = !cpu_has_tsc; timer_ack = 1;
timer_ack |= (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver));
if (timer_over_8254 > 0) if (timer_over_8254 > 0)
enable_8259A_irq(0); enable_8259A_irq(0);
......
...@@ -155,6 +155,7 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable) ...@@ -155,6 +155,7 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)
wrmsr(msr, value, dummy); wrmsr(msr, value, dummy);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event);
int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable) int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable)
{ {
...@@ -222,6 +223,7 @@ int geode_mfgpt_alloc_timer(int timer, int domain) ...@@ -222,6 +223,7 @@ int geode_mfgpt_alloc_timer(int timer, int domain)
/* No timers available - too bad */ /* No timers available - too bad */
return -1; return -1;
} }
EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer);
#ifdef CONFIG_GEODE_MFGPT_TIMER #ifdef CONFIG_GEODE_MFGPT_TIMER
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <asm/smp.h> #include <asm/smp.h>
#include <asm/nmi.h> #include <asm/nmi.h>
#include <asm/timer.h>
#include "mach_traps.h" #include "mach_traps.h"
...@@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void) ...@@ -82,7 +81,7 @@ int __init check_nmi_watchdog(void)
prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL); prev_nmi_count = kmalloc(NR_CPUS * sizeof(int), GFP_KERNEL);
if (!prev_nmi_count) if (!prev_nmi_count)
goto error; return -1;
printk(KERN_INFO "Testing NMI watchdog ... "); printk(KERN_INFO "Testing NMI watchdog ... ");
...@@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void) ...@@ -119,7 +118,7 @@ int __init check_nmi_watchdog(void)
if (!atomic_read(&nmi_active)) { if (!atomic_read(&nmi_active)) {
kfree(prev_nmi_count); kfree(prev_nmi_count);
atomic_set(&nmi_active, -1); atomic_set(&nmi_active, -1);
goto error; return -1;
} }
printk("OK.\n"); printk("OK.\n");
...@@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void) ...@@ -130,10 +129,6 @@ int __init check_nmi_watchdog(void)
kfree(prev_nmi_count); kfree(prev_nmi_count);
return 0; return 0;
error:
timer_ack = !cpu_has_tsc;
return -1;
} }
static int __init setup_nmi_watchdog(char *str) static int __init setup_nmi_watchdog(char *str)
......
...@@ -544,6 +544,7 @@ do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs, ...@@ -544,6 +544,7 @@ do_trap(int trapnr, int signr, char *str, int vm86, struct pt_regs *regs,
#define DO_ERROR(trapnr, signr, str, name) \ #define DO_ERROR(trapnr, signr, str, name) \
void do_##name(struct pt_regs *regs, long error_code) \ void do_##name(struct pt_regs *regs, long error_code) \
{ \ { \
trace_hardirqs_fixup(); \
if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \ if (notify_die(DIE_TRAP, str, regs, error_code, trapnr, signr) \
== NOTIFY_STOP) \ == NOTIFY_STOP) \
return; \ return; \
......
...@@ -497,6 +497,11 @@ static int vmalloc_fault(unsigned long address) ...@@ -497,6 +497,11 @@ static int vmalloc_fault(unsigned long address)
unsigned long pgd_paddr; unsigned long pgd_paddr;
pmd_t *pmd_k; pmd_t *pmd_k;
pte_t *pte_k; pte_t *pte_k;
/* Make sure we are in vmalloc area */
if (!(address >= VMALLOC_START && address < VMALLOC_END))
return -1;
/* /*
* Synchronize this task's top level page-table * Synchronize this task's top level page-table
* with the 'reference' page table. * with the 'reference' page table.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment