Acked-by: jbeulich@novell.com
----
- arch/x86/Kconfig | 4
- arch/x86/ia32/ia32entry-xen.S | 5
- arch/x86/kernel/Makefile | 4
- arch/x86/kernel/acpi/sleep_64-xen.c | 6
- arch/x86/kernel/apic_32-xen.c | 65 ----
- arch/x86/kernel/cpu/common-xen.c | 14
- arch/x86/kernel/e820_32-xen.c | 18 -
- arch/x86/kernel/e820_64-xen.c | 40 ++
- arch/x86/kernel/entry_32-xen.S | 80 +++--
- arch/x86/kernel/entry_64-xen.S | 3
- arch/x86/kernel/genapic_64-xen.c | 4
- arch/x86/kernel/head64-xen.c | 8
- arch/x86/kernel/head_32-xen.S | 9
- arch/x86/kernel/io_apic_32-xen.c | 43 +-
- arch/x86/kernel/io_apic_64-xen.c | 414 +++++++++++++-------------
- arch/x86/kernel/irq_32-xen.c | 22 +
- arch/x86/kernel/irq_64-xen.c | 13
- arch/x86/kernel/microcode-xen.c | 2
- arch/x86/kernel/mpparse_32-xen.c | 4
- arch/x86/kernel/mpparse_64-xen.c | 6
- arch/x86/kernel/pci-dma-xen.c | 2
- arch/x86/kernel/pcspeaker.c | 5
- arch/x86/kernel/process_32-xen.c | 42 +-
- arch/x86/kernel/process_64-xen.c | 13
- arch/x86/kernel/setup_32-xen.c | 46 --
- arch/x86/kernel/setup_64-xen.c | 184 +----------
- arch/x86/kernel/smp_32-xen.c | 5
- arch/x86/kernel/time_32-xen.c | 279 +----------------
- arch/x86/kernel/traps_32-xen.c | 27 +
- arch/x86/kernel/vsyscall_64-xen.c | 127 ++++---
- arch/x86/mm/fault_32-xen.c | 44 --
- arch/x86/mm/fault_64-xen.c | 39 --
- arch/x86/mm/highmem_32-xen.c | 9
- arch/x86/mm/init_32-xen.c | 2
- arch/x86/mm/init_64-xen.c | 24 +
- arch/x86/mm/pageattr_64-xen.c | 6
- arch/x86/mm/pgtable_32-xen.c | 28 +
- drivers/acpi/processor_extcntl.c | 18 -
- drivers/char/tpm/tpm_xen.c | 5
- drivers/pci/msi-xen.c | 196 +++---------
- drivers/xen/balloon/sysfs.c | 1
- drivers/xen/blkback/xenbus.c | 4
- drivers/xen/blkfront/blkfront.c | 1
- drivers/xen/blktap/xenbus.c | 4
- drivers/xen/core/evtchn.c | 4
- drivers/xen/core/smpboot.c | 22 -
- drivers/xen/fbfront/xenfb.c | 1
- drivers/xen/fbfront/xenkbd.c | 1
- drivers/xen/netback/xenbus.c | 4
- drivers/xen/netfront/netfront.c | 49 +--
- drivers/xen/pciback/xenbus.c | 1
- drivers/xen/pcifront/xenbus.c | 1
- drivers/xen/scsiback/xenbus.c | 1
- drivers/xen/scsifront/xenbus.c | 1
- drivers/xen/tpmback/common.h | 4
- drivers/xen/tpmback/interface.c | 5
- drivers/xen/tpmback/tpmback.c | 16 -
- drivers/xen/tpmback/xenbus.c | 5
- drivers/xen/xenbus/xenbus_probe.c | 17 -
- drivers/xen/xenbus/xenbus_probe.h | 4
- drivers/xen/xenbus/xenbus_probe_backend.c | 8
- drivers/xen/xenoprof/xenoprofile.c | 2
- include/asm-x86/i8253.h | 4
- include/asm-x86/mach-xen/asm/desc_32.h | 2
- include/asm-x86/mach-xen/asm/dma-mapping_64.h | 4
- include/asm-x86/mach-xen/asm/hypervisor.h | 15
- include/asm-x86/mach-xen/asm/io_32.h | 6
- include/asm-x86/mach-xen/asm/io_64.h | 8
- include/asm-x86/mach-xen/asm/mmu_context_32.h | 10
- include/asm-x86/mach-xen/asm/pgalloc_32.h | 21 +
- include/asm-x86/mach-xen/asm/pgtable_32.h | 25 +
- include/asm-x86/mach-xen/asm/pgtable_64.h | 9
- include/asm-x86/mach-xen/asm/processor_32.h | 6
- include/asm-x86/mach-xen/asm/segment_32.h | 23 +
- include/asm-x86/mach-xen/asm/smp_32.h | 5
- include/asm-x86/mach-xen/asm/smp_64.h | 3
- include/xen/xenbus.h | 24 +
- lib/swiotlb-xen.c | 19 -
- 78 files changed, 946 insertions(+), 1259 deletions(-)
-
---- a/arch/x86/ia32/ia32entry-xen.S
-+++ b/arch/x86/ia32/ia32entry-xen.S
-@@ -465,7 +465,7 @@ ia32_sys_call_table:
- .quad sys32_vm86_warning /* vm86old */
- .quad compat_sys_wait4
- .quad sys_swapoff /* 115 */
-- .quad sys32_sysinfo
-+ .quad compat_sys_sysinfo
- .quad sys32_ipc
- .quad sys_fsync
- .quad stub32_sigreturn
-@@ -510,7 +510,7 @@ ia32_sys_call_table:
- .quad sys_sched_yield
- .quad sys_sched_get_priority_max
- .quad sys_sched_get_priority_min /* 160 */
-- .quad sys_sched_rr_get_interval
-+ .quad sys32_sched_rr_get_interval
- .quad compat_sys_nanosleep
- .quad sys_mremap
- .quad sys_setresuid16
-@@ -668,4 +668,5 @@ ia32_sys_call_table:
- .quad compat_sys_vmsplice
- .quad compat_sys_move_pages
- .quad sys_getcpu
-+ .quad sys_epoll_pwait
- ia32_syscall_end:
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
+--- sle11-2009-05-14.orig/arch/x86/Kconfig 2009-02-05 10:22:19.000000000 +0100
++++ sle11-2009-05-14/arch/x86/Kconfig 2009-03-04 11:25:55.000000000 +0100
@@ -50,13 +50,15 @@ config GENERIC_CMOS_UPDATE
config CLOCKSOURCE_WATCHDOG
config LOCKDEP_SUPPORT
def_bool y
---- a/arch/x86/kernel/acpi/sleep_64-xen.c
-+++ b/arch/x86/kernel/acpi/sleep_64-xen.c
-@@ -59,7 +59,7 @@ unsigned long acpi_wakeup_address = 0;
- unsigned long acpi_video_flags;
- extern char wakeup_start, wakeup_end;
-
--extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
-+extern unsigned long acpi_copy_wakeup_routine(unsigned long);
-
- static pgd_t low_ptr;
+--- sle11-2009-05-14.orig/arch/x86/kernel/Makefile 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/Makefile 2009-03-04 11:25:55.000000000 +0100
+@@ -124,7 +124,7 @@ ifeq ($(CONFIG_X86_64),y)
+ pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
+ endif
-@@ -67,8 +67,10 @@ static void init_low_mapping(void)
- {
- pgd_t *slot0 = pgd_offset(current->mm, 0UL);
- low_ptr = *slot0;
-+ /* FIXME: We're playing with the current task's page tables here, which
-+ * is potentially dangerous on SMP systems.
-+ */
- set_pgd(slot0, *pgd_offset(current->mm, PAGE_OFFSET));
-- WARN_ON(num_online_cpus() != 1);
- local_flush_tlb();
- }
- #endif
---- a/arch/x86/kernel/apic_32-xen.c
-+++ b/arch/x86/kernel/apic_32-xen.c
+-disabled-obj-$(CONFIG_XEN) := early-quirks.o i8253.o i8259_$(BITS).o reboot.o \
+- smpboot_$(BITS).o tsc_$(BITS).o
++disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
++ smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
+ disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
+ %/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
+--- sle11-2009-05-14.orig/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -25,6 +25,8 @@
#include <linux/kernel_stat.h>
#include <linux/sysdev.h>
int setup_profiling_timer(unsigned int multiplier)
{
return -EINVAL;
---- a/arch/x86/kernel/cpu/common-xen.c
-+++ b/arch/x86/kernel/cpu/common-xen.c
+--- sle11-2009-05-14.orig/arch/x86/kernel/cpu/common-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/cpu/common-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -610,7 +610,7 @@ void __init early_cpu_init(void)
struct pt_regs * __devinit idle_regs(struct pt_regs *regs)
{
/* Clear all 6 debug registers: */
set_debugreg(0, 0);
---- a/arch/x86/kernel/e820_32-xen.c
-+++ b/arch/x86/kernel/e820_32-xen.c
+--- sle11-2009-05-14.orig/arch/x86/kernel/e820_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/e820_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -14,6 +14,7 @@
#include <asm/pgtable.h>
#include <asm/page.h>
return sum == 0;
}
---- a/arch/x86/kernel/e820_64-xen.c
-+++ b/arch/x86/kernel/e820_64-xen.c
-@@ -88,6 +88,13 @@ static inline int bad_addr(unsigned long
- return 1;
- }
-
-+#ifdef CONFIG_NUMA
-+ /* NUMA memory to node map */
-+ if (last >= nodemap_addr && addr < nodemap_addr + nodemap_size) {
-+ *addrp = nodemap_addr + nodemap_size;
-+ return 1;
-+ }
-+#endif
- /* XXX ramdisk image here? */
- #else
- if (last < (table_end<<PAGE_SHIFT)) {
-@@ -213,6 +220,37 @@ unsigned long __init e820_end_of_ram(voi
- }
-
- /*
-+ * Find the hole size in the range.
-+ */
-+unsigned long __init e820_hole_size(unsigned long start, unsigned long end)
-+{
-+ unsigned long ram = 0;
-+ int i;
-+
-+ for (i = 0; i < e820.nr_map; i++) {
-+ struct e820entry *ei = &e820.map[i];
-+ unsigned long last, addr;
-+
-+ if (ei->type != E820_RAM ||
-+ ei->addr+ei->size <= start ||
-+ ei->addr >= end)
-+ continue;
-+
-+ addr = round_up(ei->addr, PAGE_SIZE);
-+ if (addr < start)
-+ addr = start;
-+
-+ last = round_down(ei->addr + ei->size, PAGE_SIZE);
-+ if (last >= end)
-+ last = end;
-+
-+ if (last > addr)
-+ ram += last - addr;
-+ }
-+ return ((end - start) - ram);
-+}
-+
-+/*
- * Mark e820 reserved areas as busy for the resource manager.
- */
- void __init e820_reserve_resources(struct e820entry *e820, int nr_map)
-@@ -738,7 +776,7 @@ static int __init parse_memmap_opt(char
- }
- early_param("memmap", parse_memmap_opt);
-
--void finish_e820_parsing(void)
-+void __init finish_e820_parsing(void)
- {
- if (userdef) {
- printk(KERN_INFO "user-defined physical RAM map:\n");
---- a/arch/x86/kernel/entry_32-xen.S
-+++ b/arch/x86/kernel/entry_32-xen.S
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:08:06.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/entry_32-xen.S 2009-05-14 11:09:56.000000000 +0200
@@ -30,7 +30,7 @@
* 18(%esp) - %eax
* 1C(%esp) - %ds
movl $(__USER_DS), %ecx
movl %ecx, %ds
movl %ecx, %es
-@@ -839,7 +861,7 @@ critical_fixup_table:
- .byte 0x18 # pop %eax
- .byte 0x1c # pop %ds
- .byte 0x20 # pop %es
-- .byte 0x24,0x24 # pop %gs
-+ .byte 0x24,0x24 # pop %fs
- .byte 0x28,0x28,0x28 # add $4,%esp
- .byte 0x2c # iret
- .byte 0xff,0xff,0xff,0xff # movb $1,1(%esi)
-@@ -905,6 +927,7 @@ ENTRY(coprocessor_error)
+@@ -844,7 +866,7 @@ critical_fixup_table:
+ .byte 6 # pop %eax
+ .byte 7 # pop %ds
+ .byte 8 # pop %es
+- .byte 9,9 # pop %gs
++ .byte 9,9 # pop %fs
+ .byte 10,10,10 # add $4,%esp
+ .byte 11 # iret
+ .byte -1,-1,-1,-1 # movb $1,1(%esi) = __DISABLE_INTERRUPTS
+@@ -909,6 +931,7 @@ ENTRY(coprocessor_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(simd_coprocessor_error)
RING0_INT_FRAME
-@@ -914,6 +937,7 @@ ENTRY(simd_coprocessor_error)
+@@ -918,6 +941,7 @@ ENTRY(simd_coprocessor_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(device_not_available)
RING0_INT_FRAME
-@@ -936,6 +960,7 @@ device_available_emulate:
+@@ -940,6 +964,7 @@ device_available_emulate:
call math_state_restore
jmp ret_from_exception
CFI_ENDPROC
#ifndef CONFIG_XEN
/*
-@@ -1097,10 +1122,12 @@ ENTRY(native_iret)
+@@ -1101,10 +1126,12 @@ ENTRY(native_iret)
.align 4
.long 1b,iret_exc
.previous
#endif
KPROBE_ENTRY(int3)
-@@ -1123,6 +1150,7 @@ ENTRY(overflow)
+@@ -1127,6 +1154,7 @@ ENTRY(overflow)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(bounds)
RING0_INT_FRAME
-@@ -1132,6 +1160,7 @@ ENTRY(bounds)
+@@ -1136,6 +1164,7 @@ ENTRY(bounds)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(invalid_op)
RING0_INT_FRAME
-@@ -1141,6 +1170,7 @@ ENTRY(invalid_op)
+@@ -1145,6 +1174,7 @@ ENTRY(invalid_op)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(coprocessor_segment_overrun)
RING0_INT_FRAME
-@@ -1150,6 +1180,7 @@ ENTRY(coprocessor_segment_overrun)
+@@ -1154,6 +1184,7 @@ ENTRY(coprocessor_segment_overrun)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(invalid_TSS)
RING0_EC_FRAME
-@@ -1157,6 +1188,7 @@ ENTRY(invalid_TSS)
+@@ -1161,6 +1192,7 @@ ENTRY(invalid_TSS)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(segment_not_present)
RING0_EC_FRAME
-@@ -1164,6 +1196,7 @@ ENTRY(segment_not_present)
+@@ -1168,6 +1200,7 @@ ENTRY(segment_not_present)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(stack_segment)
RING0_EC_FRAME
-@@ -1171,6 +1204,7 @@ ENTRY(stack_segment)
+@@ -1175,6 +1208,7 @@ ENTRY(stack_segment)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
KPROBE_ENTRY(general_protection)
RING0_EC_FRAME
-@@ -1186,6 +1220,7 @@ ENTRY(alignment_check)
+@@ -1190,6 +1224,7 @@ ENTRY(alignment_check)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(divide_error)
RING0_INT_FRAME
-@@ -1195,6 +1230,7 @@ ENTRY(divide_error)
+@@ -1199,6 +1234,7 @@ ENTRY(divide_error)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
#ifdef CONFIG_X86_MCE
ENTRY(machine_check)
-@@ -1205,6 +1241,7 @@ ENTRY(machine_check)
+@@ -1209,6 +1245,7 @@ ENTRY(machine_check)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
#endif
#ifndef CONFIG_XEN
-@@ -1224,6 +1261,7 @@ ENTRY(fixup_4gb_segment)
+@@ -1228,6 +1265,7 @@ ENTRY(fixup_4gb_segment)
CFI_ADJUST_CFA_OFFSET 4
jmp error_code
CFI_ENDPROC
ENTRY(kernel_thread_helper)
pushl $0 # fake return address for unwinder
---- a/arch/x86/kernel/entry_64-xen.S
-+++ b/arch/x86/kernel/entry_64-xen.S
-@@ -629,6 +629,9 @@ END(invalidate_interrupt\num)
- ENTRY(call_function_interrupt)
- apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
- END(call_function_interrupt)
-+ENTRY(irq_move_cleanup_interrupt)
-+ apicinterrupt IRQ_MOVE_CLEANUP_VECTOR,smp_irq_move_cleanup_interrupt
-+END(irq_move_cleanup_interrupt)
- #endif
-
- ENTRY(apic_timer_interrupt)
---- a/arch/x86/kernel/genapic_64-xen.c
-+++ b/arch/x86/kernel/genapic_64-xen.c
-@@ -65,8 +65,8 @@ void __init clustered_apic_check(void)
- * Some x86_64 machines use physical APIC mode regardless of how many
- * procs/clusters are present (x86_64 ES7000 is an example).
- */
-- if (acpi_fadt.revision > FADT2_REVISION_ID)
-- if (acpi_fadt.force_apic_physical_destination_mode) {
-+ if (acpi_gbl_FADT.header.revision > FADT2_REVISION_ID)
-+ if (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) {
- genapic = &apic_cluster;
- goto print;
- }
---- a/arch/x86/kernel/head_32-xen.S
-+++ b/arch/x86/kernel/head_32-xen.S
+--- sle11-2009-05-14.orig/arch/x86/kernel/head_32-xen.S 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head_32-xen.S 2009-03-04 11:25:55.000000000 +0100
@@ -27,6 +27,7 @@
#define X86_CAPABILITY new_cpu_data+CPUINFO_x86_capability
#define X86_VENDOR_ID new_cpu_data+CPUINFO_x86_vendor_id
/* get the PDA pointer */
movl $boot_pda, %eax
---- a/arch/x86/kernel/head64-xen.c
-+++ b/arch/x86/kernel/head64-xen.c
-@@ -45,8 +45,6 @@ static void __init clear_bss(void)
- #define OLD_CL_BASE_ADDR 0x90000
- #define OLD_CL_OFFSET 0x90022
-
--extern char saved_command_line[];
--
- static void __init copy_bootdata(char *real_mode_data)
- {
- #ifndef CONFIG_XEN
-@@ -62,14 +60,14 @@ static void __init copy_bootdata(char *r
- new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
- }
- command_line = (char *) ((u64)(new_data));
-- memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-+ memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
- #else
- int max_cmdline;
-
- if ((max_cmdline = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE)
- max_cmdline = COMMAND_LINE_SIZE;
-- memcpy(saved_command_line, xen_start_info->cmd_line, max_cmdline);
-- saved_command_line[max_cmdline-1] = '\0';
-+ memcpy(boot_command_line, xen_start_info->cmd_line, max_cmdline);
-+ boot_command_line[max_cmdline-1] = '\0';
- #endif
- }
-
---- a/arch/x86/kernel/io_apic_32-xen.c
-+++ b/arch/x86/kernel/io_apic_32-xen.c
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_32-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -167,7 +167,7 @@ static inline void io_apic_write(unsigne
*/
static inline void io_apic_modify(unsigned int apic, unsigned int reg, unsigned int value)
spin_unlock_irqrestore(&ioapic_lock, flags);
return 0;
---- a/arch/x86/kernel/io_apic_64-xen.c
-+++ b/arch/x86/kernel/io_apic_64-xen.c
-@@ -36,6 +36,7 @@
- #include <acpi/acpi_bus.h>
- #endif
+--- sle11-2009-05-14.orig/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/irq_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -10,7 +10,6 @@
+ * io_apic.c.)
+ */
-+#include <asm/idle.h>
- #include <asm/io.h>
- #include <asm/smp.h>
- #include <asm/desc.h>
-@@ -47,7 +48,20 @@
- #include <asm/msidef.h>
- #include <asm/hypertransport.h>
+-#include <asm/uaccess.h>
+ #include <linux/module.h>
+ #include <linux/seq_file.h>
+ #include <linux/interrupt.h>
+@@ -19,19 +18,34 @@
+ #include <linux/cpu.h>
+ #include <linux/delay.h>
--static int assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result);
-+struct irq_cfg {
-+#ifndef CONFIG_XEN
-+ cpumask_t domain;
-+ cpumask_t old_domain;
-+#endif
-+ unsigned move_cleanup_count;
-+ u8 vector;
-+ u8 move_in_progress : 1;
-+};
-+
-+/* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */
-+struct irq_cfg irq_cfg[NR_IRQS] __read_mostly;
++#include <asm/apic.h>
++#include <asm/uaccess.h>
+
-+static int assign_irq_vector(int irq, cpumask_t mask);
-
- #define __apicdebuginit __init
+ DEFINE_PER_CPU(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp;
+ EXPORT_PER_CPU_SYMBOL(irq_stat);
-@@ -89,7 +103,7 @@ int nr_ioapic_registers[MAX_IO_APICS];
- * Rough estimation of how many shared IRQs there are, can
- * be changed anytime.
+-#ifndef CONFIG_X86_LOCAL_APIC
+ /*
+ * 'what should we do if we get a hw irq event on an illegal vector'.
+ * each architecture has to answer this themselves.
*/
--#define MAX_PLUS_SHARED_IRQS NR_IRQ_VECTORS
-+#define MAX_PLUS_SHARED_IRQS NR_IRQS
- #define PIN_MAP_SIZE (MAX_PLUS_SHARED_IRQS + NR_IRQS)
+ void ack_bad_irq(unsigned int irq)
+ {
+- printk("unexpected IRQ trap at vector %02x\n", irq);
+-}
++ printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);
++
++#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_XEN)
++ /*
++ * Currently unexpected vectors happen only on SMP and APIC.
++ * We _must_ ack these because every local APIC has only N
++ * irq slots per priority level, and a 'hanging, unacked' IRQ
++ * holds up an irq slot - in excessive cases (when multiple
++ * unexpected vectors occur) that might lock up the APIC
++ * completely.
++ * But only ack when the APIC is enabled -AK
++ */
++ if (cpu_has_apic)
++ ack_APIC_irq();
+ #endif
++}
+ #ifdef CONFIG_4KSTACKS
/*
-@@ -262,21 +276,19 @@ static void __target_IO_APIC_irq(unsigne
+--- sle11-2009-05-14.orig/arch/x86/kernel/microcode-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/microcode-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -108,7 +108,7 @@ static ssize_t microcode_write (struct f
+ return ret;
+ }
- static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
- {
-+ struct irq_cfg *cfg = irq_cfg + irq;
- unsigned long flags;
- unsigned int dest;
- cpumask_t tmp;
-- int vector;
+-static struct file_operations microcode_fops = {
++static const struct file_operations microcode_fops = {
+ .owner = THIS_MODULE,
+ .write = microcode_write,
+ .open = microcode_open,
+--- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/mpparse_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -1079,7 +1079,7 @@ int mp_register_gsi(u32 gsi, int trigger
+ static int gsi_to_irq[MAX_GSI_NUM];
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
-- tmp = TARGET_CPUS;
--
-- cpus_and(mask, tmp, CPU_MASK_ALL);
-+ return;
+ /* Don't set up the ACPI SCI because it's already set up */
+- if (acpi_fadt.sci_int == gsi)
++ if (acpi_gbl_FADT.sci_interrupt == gsi)
+ return gsi;
-- vector = assign_irq_vector(irq, mask, &tmp);
-- if (vector < 0)
-+ if (assign_irq_vector(irq, mask))
- return;
+ ioapic = mp_find_ioapic(gsi);
+@@ -1136,7 +1136,7 @@ int mp_register_gsi(u32 gsi, int trigger
+ /*
+ * Don't assign IRQ used by ACPI SCI
+ */
+- if (gsi == acpi_fadt.sci_int)
++ if (gsi == acpi_gbl_FADT.sci_interrupt)
+ gsi = pci_irq++;
+ gsi_to_irq[irq] = gsi;
+ } else {
+--- sle11-2009-05-14.orig/arch/x86/kernel/pci-dma-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/pci-dma-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -311,7 +311,7 @@ int dma_declare_coherent_memory(struct d
+ return DMA_MEMORY_IO;
-+ cpus_and(tmp, cfg->domain, mask);
- dest = cpu_mask_to_apicid(tmp);
+ free1_out:
+- kfree(dev->dma_mem->bitmap);
++ kfree(dev->dma_mem);
+ out:
+ if (mem_base)
+ iounmap(mem_base);
+--- sle11-2009-05-14.orig/arch/x86/kernel/pcspeaker.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/pcspeaker.c 2009-03-04 11:25:55.000000000 +0100
+@@ -7,6 +7,11 @@ static __init int add_pcspkr(void)
+ struct platform_device *pd;
+ int ret;
- /*
-@@ -285,8 +297,8 @@ static void set_ioapic_affinity_irq(unsi
- dest = SET_APIC_LOGICAL_ID(dest);
++#ifdef CONFIG_XEN
++ if (!is_initial_xendomain())
++ return 0;
++#endif
++
+ pd = platform_device_alloc("pcspkr", -1);
+ if (!pd)
+ return -ENOMEM;
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/ptrace.h>
+ #include <linux/random.h>
+ #include <linux/personality.h>
++#include <linux/tick.h>
- spin_lock_irqsave(&ioapic_lock, flags);
-- __target_IO_APIC_irq(irq, dest, vector);
-- set_native_irq_info(irq, mask);
-+ __target_IO_APIC_irq(irq, dest, cfg->vector);
-+ irq_desc[irq].affinity = mask;
- spin_unlock_irqrestore(&ioapic_lock, flags);
- }
- #endif
-@@ -332,11 +344,11 @@ static void add_pin_to_irq(unsigned int
- reg = io_apic_read(entry->apic, 0x10 + R + pin*2); \
- reg ACTION; \
- io_apic_modify(entry->apic, reg); \
-+ FINAL; \
- if (!entry->next) \
- break; \
- entry = irq_2_pin + entry->next; \
- } \
-- FINAL; \
- }
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -160,6 +161,7 @@ void cpu_idle(void)
- #define DO_ACTION(name,R,ACTION, FINAL) \
-@@ -669,77 +681,62 @@ static int pin_2_irq(int idx, int apic,
- return irq;
- }
+ /* endless idle loop with no priority at all */
+ while (1) {
++ tick_nohz_stop_sched_tick();
+ while (!need_resched()) {
+ void (*idle)(void);
--static inline int IO_APIC_irq_trigger(int irq)
--{
-- int apic, idx, pin;
--
-- for (apic = 0; apic < nr_ioapics; apic++) {
-- for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
-- idx = find_irq_entry(apic,pin,mp_INT);
-- if ((idx != -1) && (irq == pin_2_irq(idx,apic,pin)))
-- return irq_trigger(idx);
-- }
-- }
-- /*
-- * nonexistent IRQs are edge default
-- */
-- return 0;
--}
--
--/* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
--static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly;
--
--static int __assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
-+static int __assign_irq_vector(int irq, cpumask_t mask)
- {
-- int vector;
- struct physdev_irq irq_op;
-+ struct irq_cfg *cfg;
-
-- BUG_ON((unsigned)irq >= NR_IRQ_VECTORS);
-+ BUG_ON((unsigned)irq >= NR_IRQS);
+@@ -175,6 +177,7 @@ void cpu_idle(void)
+ __get_cpu_var(irq_stat).idle_timestamp = jiffies;
+ idle();
+ }
++ tick_nohz_restart_sched_tick();
+ preempt_enable_no_resched();
+ schedule();
+ preempt_disable();
+@@ -247,8 +250,8 @@ void show_regs(struct pt_regs * regs)
+ regs->eax,regs->ebx,regs->ecx,regs->edx);
+ printk("ESI: %08lx EDI: %08lx EBP: %08lx",
+ regs->esi, regs->edi, regs->ebp);
+- printk(" DS: %04x ES: %04x GS: %04x\n",
+- 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xgs);
++ printk(" DS: %04x ES: %04x FS: %04x\n",
++ 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xfs);
- if (irq < PIRQ_BASE || irq - PIRQ_BASE > NR_PIRQS)
- return -EINVAL;
+ cr0 = read_cr0();
+ cr2 = read_cr2();
+@@ -279,7 +282,7 @@ int kernel_thread(int (*fn)(void *), voi
-- cpus_and(*result, mask, cpu_online_map);
-+ cfg = &irq_cfg[irq];
-+
-+ if ((cfg->move_in_progress) || cfg->move_cleanup_count)
-+ return -EBUSY;
+ regs.xds = __USER_DS;
+ regs.xes = __USER_DS;
+- regs.xgs = __KERNEL_PDA;
++ regs.xfs = __KERNEL_PDA;
+ regs.orig_eax = -1;
+ regs.eip = (unsigned long) kernel_thread_helper;
+ regs.xcs = __KERNEL_CS | get_kernel_rpl();
+@@ -356,7 +359,7 @@ int copy_thread(int nr, unsigned long cl
-- if (irq_vector[irq] > 0)
-- return irq_vector[irq];
-+ if (cfg->vector)
-+ return 0;
+ p->thread.eip = (unsigned long) ret_from_fork;
- irq_op.irq = irq;
- if (HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op))
- return -ENOSPC;
+- savesegment(fs,p->thread.fs);
++ savesegment(gs,p->thread.gs);
-- vector = irq_op.vector;
-- irq_vector[irq] = vector;
-+ cfg->vector = irq_op.vector;
+ tsk = current;
+ if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
+@@ -434,8 +437,8 @@ void dump_thread(struct pt_regs * regs,
+ dump->regs.eax = regs->eax;
+ dump->regs.ds = regs->xds;
+ dump->regs.es = regs->xes;
+- savesegment(fs,dump->regs.fs);
+- dump->regs.gs = regs->xgs;
++ dump->regs.fs = regs->xfs;
++ savesegment(gs,dump->regs.gs);
+ dump->regs.orig_eax = regs->orig_eax;
+ dump->regs.eip = regs->eip;
+ dump->regs.cs = regs->xcs;
+@@ -637,16 +640,6 @@ struct task_struct fastcall * __switch_t
+ prefetch(&next->i387.fxsave);
-- return vector;
-+ return 0;
- }
+ /*
+- * Restore %fs if needed.
+- *
+- * Glibc normally makes %fs be zero.
+- */
+- if (unlikely(next->fs))
+- loadsegment(fs, next->fs);
+-
+- write_pda(pcurrent, next_p);
+-
+- /*
+ * Now maybe handle debug registers
+ */
+ if (unlikely(task_thread_info(next_p)->flags & _TIF_WORK_CTXSW))
+@@ -654,6 +647,15 @@ struct task_struct fastcall * __switch_t
--static int assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
-+static int assign_irq_vector(int irq, cpumask_t mask)
- {
-- int vector;
-+ int err;
- unsigned long flags;
+ disable_tsc(prev_p, next_p);
- spin_lock_irqsave(&vector_lock, flags);
-- vector = __assign_irq_vector(irq, mask, result);
-+ err = __assign_irq_vector(irq, mask);
- spin_unlock_irqrestore(&vector_lock, flags);
-- return vector;
-+ return err;
++ /*
++ * Leave lazy mode, flushing any hypercalls made here.
++ * This must be done before restoring TLS segments so
++ * the GDT and LDT are properly updated, and must be
++ * done before math_state_restore, so the TS bit is up
++ * to date.
++ */
++ arch_leave_lazy_cpu_mode();
++
+ /* If the task has used fpu the last 5 timeslices, just do a full
+ * restore of the math state immediately to avoid the trap; the
+ * chances of needing FPU soon are obviously high now
+@@ -661,6 +663,14 @@ struct task_struct fastcall * __switch_t
+ if (next_p->fpu_counter > 5)
+ math_state_restore();
+
++ /*
++ * Restore %gs if needed (which is common)
++ */
++ if (prev->gs | next->gs)
++ loadsegment(gs, next->gs);
++
++ write_pda(pcurrent, next_p);
++
+ return prev_p;
}
- #ifndef CONFIG_XEN
- static void __clear_irq_vector(int irq)
- {
-+ struct irq_cfg *cfg;
- cpumask_t mask;
- int cpu, vector;
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -33,7 +33,6 @@
+ #include <linux/initrd.h>
+ #include <linux/bootmem.h>
+ #include <linux/seq_file.h>
+-#include <linux/platform_device.h>
+ #include <linux/console.h>
+ #include <linux/mca.h>
+ #include <linux/root_dev.h>
+@@ -148,7 +147,7 @@ unsigned long saved_videomode;
+ #define RAMDISK_PROMPT_FLAG 0x8000
+ #define RAMDISK_LOAD_FLAG 0x4000
-- BUG_ON(!irq_vector[irq]);
-+ BUG_ON((unsigned)irq >= NR_IRQS);
-+ cfg = &irq_cfg[irq];
-+ BUG_ON(!cfg->vector);
+-static char command_line[COMMAND_LINE_SIZE];
++static char __initdata command_line[COMMAND_LINE_SIZE];
-- vector = irq_vector[irq];
-- cpus_and(mask, irq_domain[irq], cpu_online_map);
-+ vector = cfg->vector;
-+ cpus_and(mask, cfg->domain, cpu_online_map);
- for_each_cpu_mask(cpu, mask)
- per_cpu(vector_irq, cpu)[vector] = -1;
+ unsigned char __initdata boot_params[PARAM_SIZE];
-- irq_vector[irq] = 0;
-- irq_domain[irq] = CPU_MASK_NONE;
-+ cfg->vector = 0;
-+ cfg->domain = CPU_MASK_NONE;
- }
+@@ -647,8 +646,8 @@ void __init setup_arch(char **cmdline_p)
- void __setup_vector_irq(int cpu)
-@@ -749,10 +746,10 @@ void __setup_vector_irq(int cpu)
- int irq, vector;
+ if ((i = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE)
+ i = COMMAND_LINE_SIZE;
+- memcpy(saved_command_line, xen_start_info->cmd_line, i);
+- saved_command_line[i - 1] = '\0';
++ memcpy(boot_command_line, xen_start_info->cmd_line, i);
++ boot_command_line[i - 1] = '\0';
+ parse_early_param();
- /* Mark the inuse vectors */
-- for (irq = 0; irq < NR_IRQ_VECTORS; ++irq) {
-- if (!cpu_isset(cpu, irq_domain[irq]))
-+ for (irq = 0; irq < NR_IRQS; ++irq) {
-+ if (!cpu_isset(cpu, irq_cfg[irq].domain))
- continue;
-- vector = irq_vector[irq];
-+ vector = irq_cfg[irq].vector;
- per_cpu(vector_irq, cpu)[vector] = irq;
- }
- /* Mark the free vectors */
-@@ -760,41 +757,49 @@ void __setup_vector_irq(int cpu)
- irq = per_cpu(vector_irq, cpu)[vector];
- if (irq < 0)
- continue;
-- if (!cpu_isset(cpu, irq_domain[irq]))
-+ if (!cpu_isset(cpu, irq_cfg[irq].domain))
- per_cpu(vector_irq, cpu)[vector] = -1;
+ if (user_defined_memmap) {
+@@ -656,11 +655,19 @@ void __init setup_arch(char **cmdline_p)
+ print_memory_map("user");
}
- }
-
--extern void (*interrupt[NR_IRQS])(void);
--
- static struct irq_chip ioapic_chip;
--#define IOAPIC_AUTO -1
--#define IOAPIC_EDGE 0
--#define IOAPIC_LEVEL 1
--
--static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
-+static void ioapic_register_intr(int irq, unsigned long trigger)
- {
-- if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
-- trigger == IOAPIC_LEVEL)
-+ if (trigger)
- set_irq_chip_and_handler_name(irq, &ioapic_chip,
- handle_fasteoi_irq, "fasteoi");
-- else {
-- irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
-+ else
- set_irq_chip_and_handler_name(irq, &ioapic_chip,
- handle_edge_irq, "edge");
-- }
- }
- #else
--#define ioapic_register_intr(irq, vector, trigger) evtchn_register_pirq(irq)
-+#define ioapic_register_intr(irq, trigger) evtchn_register_pirq(irq)
- #endif /* !CONFIG_XEN */
+- strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
++ strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
+ *cmdline_p = command_line;
--static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
-+static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,
-+ int trigger, int polarity)
- {
-+ struct irq_cfg *cfg = irq_cfg + irq;
- struct IO_APIC_route_entry entry;
-- int vector;
-- unsigned long flags;
-+ cpumask_t mask;
-+
-+ if (!IO_APIC_IRQ(irq))
-+ return;
+ max_low_pfn = setup_memory();
-+ mask = TARGET_CPUS;
-+ if (assign_irq_vector(irq, mask))
-+ return;
-+
-+#ifndef CONFIG_XEN
-+ cpus_and(mask, cfg->domain, mask);
++#ifdef CONFIG_VMI
++ /*
++ * Must be after max_low_pfn is determined, and before kernel
++ * pagetables are setup.
++ */
++ vmi_init();
+#endif
+
-+ apic_printk(APIC_VERBOSE,KERN_DEBUG
-+ "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> "
-+ "IRQ %d Mode:%i Active:%i)\n",
-+ apic, mp_ioapics[apic].mpc_apicid, pin, cfg->vector,
-+ irq, trigger, polarity);
-
/*
- * add it to the IO-APIC irq-routing table:
-@@ -803,41 +808,23 @@ static void __init setup_IO_APIC_irq(int
-
- entry.delivery_mode = INT_DELIVERY_MODE;
- entry.dest_mode = INT_DEST_MODE;
-+ entry.dest = cpu_mask_to_apicid(mask);
- entry.mask = 0; /* enable IRQ */
-- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
--
-- entry.trigger = irq_trigger(idx);
-- entry.polarity = irq_polarity(idx);
-+ entry.trigger = trigger;
-+ entry.polarity = polarity;
-+ entry.vector = cfg->vector;
+ * NOTE: before this point _nobody_ is allowed to allocate
+ * any memory using the bootmem allocator. Although the
+@@ -823,7 +830,6 @@ void __init setup_arch(char **cmdline_p)
+ conswitchp = &dummy_con;
+ #endif
+ }
+- tsc_init();
+ }
-- if (irq_trigger(idx)) {
-- entry.trigger = 1;
-+ /* Mask level triggered irqs.
-+ * Use IRQ_DELAYED_DISABLE for edge triggered irqs.
-+ */
-+ if (trigger)
- entry.mask = 1;
-- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
-- }
+ static int
+@@ -833,31 +839,3 @@ xen_panic_event(struct notifier_block *t
+ /* we're never actually going to get here... */
+ return NOTIFY_DONE;
+ }
-
-- if (/* !apic && */ !IO_APIC_IRQ(irq))
-- return;
-
-- if (IO_APIC_IRQ(irq)) {
-- cpumask_t mask;
-- vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
-- if (vector < 0)
-- return;
+-static __init int add_pcspkr(void)
+-{
+- struct platform_device *pd;
+- int ret;
-
-- entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
-- entry.vector = vector;
+- if (!is_initial_xendomain())
+- return 0;
-
-- ioapic_register_intr(irq, vector, IOAPIC_AUTO);
-- if (!apic && (irq < 16))
-- disable_8259A_irq(irq);
-- }
-+ ioapic_register_intr(irq, trigger);
-+ if (irq < 16)
-+ disable_8259A_irq(irq);
-
- ioapic_write_entry(apic, pin, entry);
+- pd = platform_device_alloc("pcspkr", -1);
+- if (!pd)
+- return -ENOMEM;
-
-- spin_lock_irqsave(&ioapic_lock, flags);
-- set_native_irq_info(irq, TARGET_CPUS);
-- spin_unlock_irqrestore(&ioapic_lock, flags);
+- ret = platform_device_add(pd);
+- if (ret)
+- platform_device_put(pd);
-
- }
-
- static void __init setup_IO_APIC_irqs(void)
-@@ -862,8 +849,8 @@ static void __init setup_IO_APIC_irqs(vo
- irq = pin_2_irq(idx, apic, pin);
- add_pin_to_irq(irq, apic, pin);
-
-- setup_IO_APIC_irq(apic, pin, idx, irq);
+- return ret;
+-}
+-device_initcall(add_pcspkr);
-
-+ setup_IO_APIC_irq(apic, pin, irq,
-+ irq_trigger(idx), irq_polarity(idx));
- }
- }
-
-@@ -894,7 +881,7 @@ static void __init setup_ExtINT_IRQ0_pin
+-/*
+- * Local Variables:
+- * mode:c
+- * c-file-style:"k&r"
+- * c-basic-offset:8
+- * End:
+- */
+--- sle11-2009-05-14.orig/arch/x86/kernel/smp_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/smp_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -335,8 +335,7 @@ static void flush_tlb_others(cpumask_t c
+ /*
+ * i'm not happy about this global shared spinlock in the
+ * MM hot path, but we'll see how contended it is.
+- * Temporarily this turns IRQs off, so that lockups are
+- * detected by the NMI watchdog.
++ * AK: x86-64 has a faster method that could be ported.
*/
- entry.dest_mode = INT_DEST_MODE;
- entry.mask = 0; /* unmask IRQ now */
-- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
-+ entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
- entry.delivery_mode = INT_DELIVERY_MODE;
- entry.polarity = 0;
- entry.trigger = 0;
-@@ -994,18 +981,17 @@ void __apicdebuginit print_IO_APIC(void)
+ spin_lock(&tlbstate_lock);
+
+@@ -361,7 +360,7 @@ static void flush_tlb_others(cpumask_t c
- printk(KERN_DEBUG ".... IRQ redirection table:\n");
+ while (!cpus_empty(flush_cpumask))
+ /* nothing. lockup detection does not belong here */
+- mb();
++ cpu_relax();
-- printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
-- " Stat Dest Deli Vect: \n");
-+ printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
-+ " Stat Dmod Deli Vect: \n");
+ flush_mm = NULL;
+ flush_va = 0;
+--- sle11-2009-05-14.orig/arch/x86/kernel/time_32-xen.c 2009-03-24 10:08:30.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/time_32-xen.c 2009-03-24 10:11:08.000000000 +0100
+@@ -51,6 +51,7 @@
+ #include <linux/kernel_stat.h>
+ #include <linux/posix-timers.h>
+ #include <linux/cpufreq.h>
++#include <linux/clocksource.h>
- for (i = 0; i <= reg_01.bits.entries; i++) {
- struct IO_APIC_route_entry entry;
+ #include <asm/io.h>
+ #include <asm/smp.h>
+@@ -75,25 +76,17 @@
+ #include <xen/evtchn.h>
+ #include <xen/interface/vcpu.h>
- entry = ioapic_read_entry(apic, i);
+-#if defined (__i386__)
+-#include <asm/i8259.h>
++#ifdef CONFIG_X86_32
+ #include <asm/i8253.h>
+ DEFINE_SPINLOCK(i8253_lock);
+ EXPORT_SYMBOL(i8253_lock);
+-#endif
+-
+-#define XEN_SHIFT 22
+-
+ int pit_latch_buggy; /* extern */
+-
+-#if defined(__x86_64__)
+-unsigned long vxtime_hz = PIT_TICK_RATE;
+-struct vxtime_data __vxtime __section_vxtime; /* for vsyscalls */
++#else
+ volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
+-struct timespec __xtime __section_xtime;
+-struct timezone __sys_tz __section_sys_tz;
+ #endif
-- printk(KERN_DEBUG " %02x %03X %02X ",
-+ printk(KERN_DEBUG " %02x %03X ",
- i,
-- entry.dest.logical.logical_dest,
-- entry.dest.physical.physical_dest
-+ entry.dest
- );
-
- printk("%1d %1d %1d %1d %1d %1d %1d %02X\n",
-@@ -1269,8 +1255,7 @@ void disable_IO_APIC(void)
- entry.dest_mode = 0; /* Physical */
- entry.delivery_mode = dest_ExtINT; /* ExtInt */
- entry.vector = 0;
-- entry.dest.physical.physical_dest =
-- GET_APIC_ID(apic_read(APIC_ID));
-+ entry.dest = GET_APIC_ID(apic_read(APIC_ID));
-
- /*
- * Add it to the IO-APIC irq-routing table:
-@@ -1355,16 +1340,15 @@ static unsigned int startup_ioapic_irq(u
-
- static int ioapic_retrigger_irq(unsigned int irq)
- {
-+ struct irq_cfg *cfg = &irq_cfg[irq];
- cpumask_t mask;
-- unsigned vector;
- unsigned long flags;
-
- spin_lock_irqsave(&vector_lock, flags);
-- vector = irq_vector[irq];
- cpus_clear(mask);
-- cpu_set(first_cpu(irq_domain[irq]), mask);
-+ cpu_set(first_cpu(cfg->domain), mask);
-
-- send_IPI_mask(mask, vector);
-+ send_IPI_mask(mask, cfg->vector);
- spin_unlock_irqrestore(&vector_lock, flags);
++#define XEN_SHIFT 22
++
+ unsigned int cpu_khz; /* Detected as we calibrate the TSC */
+ EXPORT_SYMBOL(cpu_khz);
- return 1;
-@@ -1379,8 +1363,68 @@ static int ioapic_retrigger_irq(unsigned
- * races.
- */
+@@ -113,9 +106,6 @@ static DEFINE_PER_CPU(struct shadow_time
+ static struct timespec shadow_tv;
+ static u32 shadow_tv_version;
-+#ifdef CONFIG_SMP
-+asmlinkage void smp_irq_move_cleanup_interrupt(void)
-+{
-+ unsigned vector, me;
-+ ack_APIC_irq();
-+ exit_idle();
-+ irq_enter();
-+
-+ me = smp_processor_id();
-+ for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
-+ unsigned int irq;
-+ struct irq_desc *desc;
-+ struct irq_cfg *cfg;
-+ irq = __get_cpu_var(vector_irq)[vector];
-+ if (irq >= NR_IRQS)
-+ continue;
-+
-+ desc = irq_desc + irq;
-+ cfg = irq_cfg + irq;
-+ spin_lock(&desc->lock);
-+ if (!cfg->move_cleanup_count)
-+ goto unlock;
-+
-+ if ((vector == cfg->vector) && cpu_isset(me, cfg->domain))
-+ goto unlock;
-+
-+ __get_cpu_var(vector_irq)[vector] = -1;
-+ cfg->move_cleanup_count--;
-+unlock:
-+ spin_unlock(&desc->lock);
-+ }
-+
-+ irq_exit();
-+}
-+
-+static void irq_complete_move(unsigned int irq)
-+{
-+ struct irq_cfg *cfg = irq_cfg + irq;
-+ unsigned vector, me;
-+
-+ if (likely(!cfg->move_in_progress))
-+ return;
-+
-+ vector = ~get_irq_regs()->orig_rax;
-+ me = smp_processor_id();
-+ if ((vector == cfg->vector) &&
-+ cpu_isset(smp_processor_id(), cfg->domain)) {
-+ cpumask_t cleanup_mask;
-+
-+ cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map);
-+ cfg->move_cleanup_count = cpus_weight(cleanup_mask);
-+ send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);
-+ cfg->move_in_progress = 0;
-+ }
-+}
-+#else
-+static inline void irq_complete_move(unsigned int irq) {}
-+#endif
-+
- static void ack_apic_edge(unsigned int irq)
- {
-+ irq_complete_move(irq);
- move_native_irq(irq);
- ack_APIC_irq();
+-static struct timeval monotonic_tv;
+-static spinlock_t monotonic_lock = SPIN_LOCK_UNLOCKED;
+-
+ /* Keep track of last time we did processing/updating of jiffies and xtime. */
+ static u64 processed_system_time; /* System time (ns) at last processing. */
+ static DEFINE_PER_CPU(u64, processed_system_time);
+@@ -228,7 +218,7 @@ static inline u64 scale_delta(u64 delta,
+ return product;
}
-@@ -1389,6 +1433,7 @@ static void ack_apic_level(unsigned int
- {
- int do_unmask_irq = 0;
-
-+ irq_complete_move(irq);
- #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)
- /* If we are moving the irq we need to mask it */
- if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {
-@@ -1440,7 +1485,7 @@ static inline void init_IO_APIC_traps(vo
- */
- for (irq = 0; irq < NR_IRQS ; irq++) {
- int tmp = irq;
-- if (IO_APIC_IRQ(tmp) && !irq_vector[tmp]) {
-+ if (IO_APIC_IRQ(tmp) && !irq_cfg[tmp].vector) {
- /*
- * Hmm.. We don't have an entry for this,
- * so default to an old-fashioned 8259
-@@ -1538,7 +1583,7 @@ static inline void unlock_ExtINT_logic(v
- entry1.dest_mode = 0; /* physical delivery */
- entry1.mask = 0; /* unmask IRQ now */
-- entry1.dest.physical.physical_dest = hard_smp_processor_id();
-+ entry1.dest = hard_smp_processor_id();
- entry1.delivery_mode = dest_ExtINT;
- entry1.polarity = entry0.polarity;
- entry1.trigger = 0;
-@@ -1582,15 +1627,14 @@ static inline void unlock_ExtINT_logic(v
- */
- static inline void check_timer(void)
+-void init_cpu_khz(void)
++static void init_cpu_khz(void)
{
-+ struct irq_cfg *cfg = irq_cfg + 0;
- int apic1, pin1, apic2, pin2;
-- int vector;
-- cpumask_t mask;
-
- /*
- * get/set the timer IRQ vector:
- */
- disable_8259A_irq(0);
-- vector = assign_irq_vector(0, TARGET_CPUS, &mask);
-+ assign_irq_vector(0, TARGET_CPUS);
-
- /*
- * Subtle, code in do_timer_interrupt() expects an AEOI
-@@ -1610,7 +1654,7 @@ static inline void check_timer(void)
- apic2 = ioapic_i8259.apic;
-
- apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n",
-- vector, apic1, pin1, apic2, pin2);
-+ cfg->vector, apic1, pin1, apic2, pin2);
-
- if (pin1 != -1) {
- /*
-@@ -1641,7 +1685,7 @@ static inline void check_timer(void)
- /*
- * legacy devices should be connected to IO APIC #0
- */
-- setup_ExtINT_IRQ0_pin(apic2, pin2, vector);
-+ setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector);
- if (timer_irq_works()) {
- apic_printk(APIC_VERBOSE," works.\n");
- nmi_watchdog_default();
-@@ -1666,14 +1710,14 @@ static inline void check_timer(void)
-
- disable_8259A_irq(0);
- irq_desc[0].chip = &lapic_irq_type;
-- apic_write(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */
-+ apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */
- enable_8259A_irq(0);
-
- if (timer_irq_works()) {
- apic_printk(APIC_VERBOSE," works.\n");
- return;
- }
-- apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector);
-+ apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector);
- apic_printk(APIC_VERBOSE," failed.\n");
-
- apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as ExtINT IRQ...");
-@@ -1828,19 +1872,16 @@ int create_irq(void)
- /* Allocate an unused irq */
- int irq;
- int new;
-- int vector = 0;
- unsigned long flags;
-- cpumask_t mask;
+ u64 __cpu_khz = 1000000ULL << 32;
+ struct vcpu_time_info *info = &vcpu_info(0)->time;
+@@ -247,16 +237,6 @@ static u64 get_nsec_offset(struct shadow
+ return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift);
+ }
- irq = -ENOSPC;
- spin_lock_irqsave(&vector_lock, flags);
- for (new = (NR_IRQS - 1); new >= 0; new--) {
- if (platform_legacy_irq(new))
- continue;
-- if (irq_vector[new] != 0)
-+ if (irq_cfg[new].vector != 0)
- continue;
-- vector = __assign_irq_vector(new, TARGET_CPUS, &mask);
-- if (likely(vector > 0))
-+ if (__assign_irq_vector(new, TARGET_CPUS) == 0)
- irq = new;
- break;
- }
-@@ -1871,12 +1912,15 @@ void destroy_irq(unsigned int irq)
- #if defined(CONFIG_PCI_MSI) && !defined(CONFIG_XEN)
- static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
+-#ifdef CONFIG_X86_64
+-static unsigned long get_usec_offset(struct shadow_time_info *shadow)
+-{
+- u64 now, delta;
+- rdtscll(now);
+- delta = now - shadow->tsc_timestamp;
+- return scale_delta(delta, shadow->tsc_to_usec_mul, shadow->tsc_shift);
+-}
+-#endif
+-
+ static void __update_wallclock(time_t sec, long nsec)
{
-- int vector;
-+ struct irq_cfg *cfg = irq_cfg + irq;
-+ int err;
- unsigned dest;
- cpumask_t tmp;
-
-- vector = assign_irq_vector(irq, TARGET_CPUS, &tmp);
-- if (vector >= 0) {
-+ tmp = TARGET_CPUS;
-+ err = assign_irq_vector(irq, tmp);
-+ if (!err) {
-+ cpus_and(tmp, cfg->domain, tmp);
- dest = cpu_mask_to_apicid(tmp);
+ long wtm_nsec, xtime_nsec;
+@@ -369,139 +349,6 @@ void rtc_cmos_write(unsigned char val, u
+ }
+ EXPORT_SYMBOL(rtc_cmos_write);
- msg->address_hi = MSI_ADDR_BASE_HI;
-@@ -1896,40 +1940,38 @@ static int msi_compose_msg(struct pci_de
- ((INT_DELIVERY_MODE != dest_LowestPrio) ?
- MSI_DATA_DELIVERY_FIXED:
- MSI_DATA_DELIVERY_LOWPRI) |
-- MSI_DATA_VECTOR(vector);
-+ MSI_DATA_VECTOR(cfg->vector);
- }
-- return vector;
-+ return err;
- }
-
- #ifdef CONFIG_SMP
- static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
- {
-+ struct irq_cfg *cfg = irq_cfg + irq;
- struct msi_msg msg;
- unsigned int dest;
- cpumask_t tmp;
-- int vector;
-
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
-- tmp = TARGET_CPUS;
--
-- cpus_and(mask, tmp, CPU_MASK_ALL);
-+ return;
-
-- vector = assign_irq_vector(irq, mask, &tmp);
-- if (vector < 0)
-+ if (assign_irq_vector(irq, mask))
- return;
-
-+ cpus_and(tmp, cfg->domain, mask);
- dest = cpu_mask_to_apicid(tmp);
-
- read_msi_msg(irq, &msg);
-
- msg.data &= ~MSI_DATA_VECTOR_MASK;
-- msg.data |= MSI_DATA_VECTOR(vector);
-+ msg.data |= MSI_DATA_VECTOR(cfg->vector);
- msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
- msg.address_lo |= MSI_ADDR_DEST_ID(dest);
-
- write_msi_msg(irq, &msg);
-- set_native_irq_info(irq, mask);
-+ irq_desc[irq].affinity = mask;
- }
- #endif /* CONFIG_SMP */
-
-@@ -1948,24 +1990,31 @@ static struct irq_chip msi_chip = {
- .retrigger = ioapic_retrigger_irq,
- };
-
--int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev)
-+int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
- {
- struct msi_msg msg;
-- int ret;
-+ int irq, ret;
-+ irq = create_irq();
-+ if (irq < 0)
-+ return irq;
-+
-+ set_irq_msi(irq, desc);
- ret = msi_compose_msg(dev, irq, &msg);
-- if (ret < 0)
-+ if (ret < 0) {
-+ destroy_irq(irq);
- return ret;
-+ }
-
- write_msi_msg(irq, &msg);
-
- set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");
-
-- return 0;
-+ return irq;
- }
-
- void arch_teardown_msi_irq(unsigned int irq)
- {
-- return;
-+ destroy_irq(irq);
- }
-
- #endif /* CONFIG_PCI_MSI */
-@@ -1993,24 +2042,22 @@ static void target_ht_irq(unsigned int i
-
- static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask)
- {
-+ struct irq_cfg *cfg = irq_cfg + irq;
- unsigned int dest;
- cpumask_t tmp;
-- int vector;
-
- cpus_and(tmp, mask, cpu_online_map);
- if (cpus_empty(tmp))
-- tmp = TARGET_CPUS;
+-#ifdef CONFIG_X86_64
-
-- cpus_and(mask, tmp, CPU_MASK_ALL);
-+ return;
-
-- vector = assign_irq_vector(irq, mask, &tmp);
-- if (vector < 0)
-+ if (assign_irq_vector(irq, mask))
- return;
-
-+ cpus_and(tmp, cfg->domain, mask);
- dest = cpu_mask_to_apicid(tmp);
-
-- target_ht_irq(irq, dest, vector);
-- set_native_irq_info(irq, mask);
-+ target_ht_irq(irq, dest, cfg->vector);
-+ irq_desc[irq].affinity = mask;
- }
- #endif
-
-@@ -2027,14 +2074,17 @@ static struct irq_chip ht_irq_chip = {
-
- int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)
- {
-- int vector;
-+ struct irq_cfg *cfg = irq_cfg + irq;
-+ int err;
- cpumask_t tmp;
-
-- vector = assign_irq_vector(irq, TARGET_CPUS, &tmp);
-- if (vector >= 0) {
-+ tmp = TARGET_CPUS;
-+ err = assign_irq_vector(irq, tmp);
-+ if (!err) {
- struct ht_irq_msg msg;
- unsigned dest;
-
-+ cpus_and(tmp, cfg->domain, tmp);
- dest = cpu_mask_to_apicid(tmp);
-
- msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest);
-@@ -2042,7 +2092,7 @@ int arch_setup_ht_irq(unsigned int irq,
- msg.address_lo =
- HT_IRQ_LOW_BASE |
- HT_IRQ_LOW_DEST_ID(dest) |
-- HT_IRQ_LOW_VECTOR(vector) |
-+ HT_IRQ_LOW_VECTOR(cfg->vector) |
- ((INT_DEST_MODE == 0) ?
- HT_IRQ_LOW_DM_PHYSICAL :
- HT_IRQ_LOW_DM_LOGICAL) |
-@@ -2057,7 +2107,7 @@ int arch_setup_ht_irq(unsigned int irq,
- set_irq_chip_and_handler_name(irq, &ht_irq_chip,
- handle_edge_irq, "edge");
- }
-- return vector;
-+ return err;
- }
- #endif /* CONFIG_HT_IRQ */
-
-@@ -2082,13 +2132,8 @@ int __init io_apic_get_redir_entries (in
- }
-
-
--int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low)
-+int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity)
- {
-- struct IO_APIC_route_entry entry;
+-/*
+- * This version of gettimeofday has microsecond resolution
+- * and better than microsecond precision on fast x86 machines with TSC.
+- */
+-void do_gettimeofday(struct timeval *tv)
+-{
+- unsigned long seq;
+- unsigned long usec, sec;
- unsigned long flags;
-- int vector;
-- cpumask_t mask;
+- s64 nsec;
+- unsigned int cpu;
+- struct shadow_time_info *shadow;
+- u32 local_time_version;
-
- if (!IO_APIC_IRQ(irq)) {
- apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n",
- ioapic);
-@@ -2101,42 +2146,7 @@ int io_apic_set_pci_routing (int ioapic,
- if (irq >= 16)
- add_pin_to_irq(irq, ioapic, pin);
-
+- cpu = get_cpu();
+- shadow = &per_cpu(shadow_time, cpu);
-
-- vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
-- if (vector < 0)
-- return vector;
+- do {
+- local_time_version = shadow->version;
+- seq = read_seqbegin(&xtime_lock);
-
-- /*
-- * Generate a PCI IRQ routing entry and program the IOAPIC accordingly.
-- * Note that we mask (disable) IRQs now -- these get enabled when the
-- * corresponding device driver registers for this IRQ.
-- */
+- usec = get_usec_offset(shadow);
-
-- memset(&entry,0,sizeof(entry));
+- sec = xtime.tv_sec;
+- usec += (xtime.tv_nsec / NSEC_PER_USEC);
-
-- entry.delivery_mode = INT_DELIVERY_MODE;
-- entry.dest_mode = INT_DEST_MODE;
-- entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
-- entry.trigger = edge_level;
-- entry.polarity = active_high_low;
-- entry.mask = 1; /* Disabled (masked) */
-- entry.vector = vector & 0xff;
+- nsec = shadow->system_timestamp - processed_system_time;
+- __normalize_time(&sec, &nsec);
+- usec += (long)nsec / NSEC_PER_USEC;
-
-- apic_printk(APIC_VERBOSE,KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
-- "IRQ %d Mode:%i Active:%i)\n", ioapic,
-- mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq,
-- edge_level, active_high_low);
+- if (unlikely(!time_values_up_to_date(cpu))) {
+- /*
+- * We may have blocked for a long time,
+- * rendering our calculations invalid
+- * (e.g. the time delta may have
+- * overflowed). Detect that and recalculate
+- * with fresh values.
+- */
+- get_time_values_from_xen(cpu);
+- continue;
+- }
+- } while (read_seqretry(&xtime_lock, seq) ||
+- (local_time_version != shadow->version));
-
-- ioapic_register_intr(irq, entry.vector, edge_level);
+- put_cpu();
-
-- if (!ioapic && (irq < 16))
-- disable_8259A_irq(irq);
+- while (usec >= USEC_PER_SEC) {
+- usec -= USEC_PER_SEC;
+- sec++;
+- }
-
-- ioapic_write_entry(ioapic, pin, entry);
+- spin_lock_irqsave(&monotonic_lock, flags);
+- if ((sec > monotonic_tv.tv_sec) ||
+- ((sec == monotonic_tv.tv_sec) && (usec > monotonic_tv.tv_usec)))
+- {
+- monotonic_tv.tv_sec = sec;
+- monotonic_tv.tv_usec = usec;
+- } else {
+- sec = monotonic_tv.tv_sec;
+- usec = monotonic_tv.tv_usec;
+- }
+- spin_unlock_irqrestore(&monotonic_lock, flags);
-
-- spin_lock_irqsave(&ioapic_lock, flags);
-- set_native_irq_info(irq, TARGET_CPUS);
-- spin_unlock_irqrestore(&ioapic_lock, flags);
-+ setup_IO_APIC_irq(ioapic, pin, irq, triggering, polarity);
-
- return 0;
- }
-@@ -2169,8 +2179,10 @@ void __init setup_ioapic_dest(void)
- * when you have too many devices, because at that time only boot
- * cpu is online.
- */
-- if(!irq_vector[irq])
-- setup_IO_APIC_irq(ioapic, pin, irq_entry, irq);
-+ if (!irq_cfg[irq].vector)
-+ setup_IO_APIC_irq(ioapic, pin, irq,
-+ irq_trigger(irq_entry),
-+ irq_polarity(irq_entry));
- else
- set_ioapic_affinity_irq(irq, TARGET_CPUS);
- }
---- a/arch/x86/kernel/irq_32-xen.c
-+++ b/arch/x86/kernel/irq_32-xen.c
-@@ -10,7 +10,6 @@
- * io_apic.c.)
- */
+- tv->tv_sec = sec;
+- tv->tv_usec = usec;
+-}
+-
+-EXPORT_SYMBOL(do_gettimeofday);
+-
+-int do_settimeofday(struct timespec *tv)
+-{
+- time_t sec;
+- s64 nsec;
+- unsigned int cpu;
+- struct shadow_time_info *shadow;
+- struct xen_platform_op op;
+-
+- if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
+- return -EINVAL;
+-
+- cpu = get_cpu();
+- shadow = &per_cpu(shadow_time, cpu);
+-
+- write_seqlock_irq(&xtime_lock);
+-
+- /*
+- * Ensure we don't get blocked for a long time so that our time delta
+- * overflows. If that were to happen then our shadow time values would
+- * be stale, so we can retry with fresh ones.
+- */
+- for (;;) {
+- nsec = tv->tv_nsec - get_nsec_offset(shadow);
+- if (time_values_up_to_date(cpu))
+- break;
+- get_time_values_from_xen(cpu);
+- }
+- sec = tv->tv_sec;
+- __normalize_time(&sec, &nsec);
+-
+- if (is_initial_xendomain() && !independent_wallclock) {
+- op.cmd = XENPF_settime;
+- op.u.settime.secs = sec;
+- op.u.settime.nsecs = nsec;
+- op.u.settime.system_time = shadow->system_timestamp;
+- WARN_ON(HYPERVISOR_platform_op(&op));
+- update_wallclock();
+- } else if (independent_wallclock) {
+- nsec -= shadow->system_timestamp;
+- __normalize_time(&sec, &nsec);
+- __update_wallclock(sec, nsec);
+- }
+- ntp_clear();
+-
+- /* Reset monotonic gettimeofday() timeval. */
+- spin_lock(&monotonic_lock);
+- monotonic_tv.tv_sec = 0;
+- monotonic_tv.tv_usec = 0;
+- spin_unlock(&monotonic_lock);
+-
+- write_sequnlock_irq(&xtime_lock);
+-
+- put_cpu();
+-
+- clock_was_set();
+- return 0;
+-}
+-
+-EXPORT_SYMBOL(do_settimeofday);
+-
+-#endif
+-
+ static void sync_xen_wallclock(unsigned long dummy);
+ static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
+ static void sync_xen_wallclock(unsigned long dummy)
+@@ -550,15 +397,7 @@ static int set_rtc_mmss(unsigned long no
+ return retval;
+ }
--#include <asm/uaccess.h>
- #include <linux/module.h>
- #include <linux/seq_file.h>
- #include <linux/interrupt.h>
-@@ -19,19 +18,34 @@
- #include <linux/cpu.h>
- #include <linux/delay.h>
+-#ifdef CONFIG_X86_64
+-/* monotonic_clock(): returns # of nanoseconds passed since time_init()
+- * Note: This function is required to return accurate
+- * time even in the absence of multiple timer ticks.
+- */
+-unsigned long long monotonic_clock(void)
+-#else
+ unsigned long long sched_clock(void)
+-#endif
+ {
+ unsigned int cpu = get_cpu();
+ struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
+@@ -578,21 +417,18 @@ unsigned long long sched_clock(void)
-+#include <asm/apic.h>
-+#include <asm/uaccess.h>
-+
- DEFINE_PER_CPU(irq_cpustat_t, irq_stat) ____cacheline_internodealigned_in_smp;
- EXPORT_PER_CPU_SYMBOL(irq_stat);
+ return time;
+ }
+-#ifdef CONFIG_X86_64
+-EXPORT_SYMBOL(monotonic_clock);
+-
+-unsigned long long sched_clock(void)
+-{
+- return monotonic_clock();
+-}
+-#endif
--#ifndef CONFIG_X86_LOCAL_APIC
- /*
- * 'what should we do if we get a hw irq event on an illegal vector'.
- * each architecture has to answer this themselves.
- */
- void ack_bad_irq(unsigned int irq)
+ unsigned long profile_pc(struct pt_regs *regs)
{
-- printk("unexpected IRQ trap at vector %02x\n", irq);
--}
-+ printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);
+ unsigned long pc = instruction_pointer(regs);
+
+ #if defined(CONFIG_SMP) || defined(__x86_64__)
+- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
++# ifdef __i386__
++ if (!v8086_mode(regs) && SEGMENT_IS_KERNEL_CODE(regs->xcs)
++# else
++ if (!user_mode(regs)
++# endif
++ && in_lock_functions(pc)) {
+ # ifdef CONFIG_FRAME_POINTER
+ # ifdef __i386__
+ return ((unsigned long *)regs->ebp)[1];
+@@ -601,14 +437,11 @@ unsigned long profile_pc(struct pt_regs
+ # endif
+ # else
+ # ifdef __i386__
+- unsigned long *sp;
+- if ((regs->xcs & 2) == 0)
+- sp = (unsigned long *)®s->esp;
+- else
+- sp = (unsigned long *)regs->esp;
++ unsigned long *sp = (unsigned long *)®s->esp;
+ # else
+ unsigned long *sp = (unsigned long *)regs->rsp;
+ # endif
+
-+#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_XEN)
-+ /*
-+ * Currently unexpected vectors happen only on SMP and APIC.
-+ * We _must_ ack these because every local APIC has only N
-+ * irq slots per priority level, and a 'hanging, unacked' IRQ
-+ * holds up an irq slot - in excessive cases (when multiple
-+ * unexpected vectors occur) that might lock up the APIC
-+ * completely.
-+ * But only ack when the APIC is enabled -AK
-+ */
-+ if (cpu_has_apic)
-+ ack_APIC_irq();
- #endif
-+}
+ /* Return address is either directly at stack pointer
+ or above a saved eflags. Eflags has bits 22-31 zero,
+ kernel addresses don't. */
+@@ -761,19 +594,6 @@ irqreturn_t timer_interrupt(int irq, voi
+ return IRQ_HANDLED;
+ }
- #ifdef CONFIG_4KSTACKS
- /*
---- a/arch/x86/kernel/irq_64-xen.c
-+++ b/arch/x86/kernel/irq_64-xen.c
-@@ -18,6 +18,7 @@
- #include <asm/uaccess.h>
- #include <asm/io_apic.h>
- #include <asm/idle.h>
-+#include <asm/smp.h>
+-#ifndef CONFIG_X86_64
+-
+-void tsc_init(void)
+-{
+- init_cpu_khz();
+- printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
+- cpu_khz / 1000, cpu_khz % 1000);
+-
+- use_tsc_delay();
+-}
+-
+-#include <linux/clocksource.h>
+-
+ void mark_tsc_unstable(void)
+ {
+ #ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
+@@ -829,21 +649,9 @@ static struct clocksource clocksource_xe
+ .mask = CLOCKSOURCE_MASK(64),
+ .mult = 1 << XEN_SHIFT, /* time directly in nanoseconds */
+ .shift = XEN_SHIFT,
+- .is_continuous = 1,
++ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+ };
- atomic_t irq_err_count;
+-static int __init init_xen_clocksource(void)
+-{
+- clocksource_xen.mult = clocksource_khz2mult(cpu_khz,
+- clocksource_xen.shift);
+-
+- return clocksource_register(&clocksource_xen);
+-}
+-
+-module_init(init_xen_clocksource);
+-
+-#endif
+-
+ static void init_missing_ticks_accounting(unsigned int cpu)
+ {
+ struct vcpu_register_runstate_memory_area area;
+@@ -864,7 +672,7 @@ static void init_missing_ticks_accountin
+ }
-@@ -120,9 +121,15 @@ asmlinkage unsigned int do_IRQ(struct pt
+ /* not static: needed by APM */
+-unsigned long get_cmos_time(void)
++unsigned long read_persistent_clock(void)
+ {
+ unsigned long retval;
+ unsigned long flags;
+@@ -877,11 +685,11 @@ unsigned long get_cmos_time(void)
- if (likely(irq < NR_IRQS))
- generic_handle_irq(irq);
-- else if (printk_ratelimit())
-- printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
-- __func__, smp_processor_id(), irq);
-+ else {
-+#ifndef CONFIG_XEN
-+ if (!disable_apic)
-+ ack_APIC_irq();
-+#endif
-+ if (printk_ratelimit())
-+ printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
-+ __func__, smp_processor_id(), irq);
-+ }
+ return retval;
+ }
+-EXPORT_SYMBOL(get_cmos_time);
- /*irq_exit();*/
+ static void sync_cmos_clock(unsigned long dummy);
---- a/arch/x86/kernel/Makefile
-+++ b/arch/x86/kernel/Makefile
-@@ -124,7 +124,7 @@ ifeq ($(CONFIG_X86_64),y)
- pci-dma_64-$(CONFIG_XEN) += pci-dma_32.o
- endif
+ static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0);
++int no_sync_cmos_clock;
--disabled-obj-$(CONFIG_XEN) := early-quirks.o i8253.o i8259_$(BITS).o reboot.o \
-- smpboot_$(BITS).o tsc_$(BITS).o
-+disabled-obj-$(CONFIG_XEN) := early-quirks.o hpet.o i8253.o i8259_$(BITS).o reboot.o \
-+ smpboot_$(BITS).o tsc_$(BITS).o tsc_sync.o
- disabled-obj-$(CONFIG_XEN_UNPRIVILEGED_GUEST) += mpparse_64.o
- %/head_$(BITS).o %/head_$(BITS).s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) :=
---- a/arch/x86/kernel/microcode-xen.c
-+++ b/arch/x86/kernel/microcode-xen.c
-@@ -108,7 +108,7 @@ static ssize_t microcode_write (struct f
- return ret;
- }
+ static void sync_cmos_clock(unsigned long dummy)
+ {
+@@ -925,7 +733,8 @@ static void sync_cmos_clock(unsigned lon
--static struct file_operations microcode_fops = {
-+static const struct file_operations microcode_fops = {
- .owner = THIS_MODULE,
- .write = microcode_write,
- .open = microcode_open,
---- a/arch/x86/kernel/mpparse_32-xen.c
-+++ b/arch/x86/kernel/mpparse_32-xen.c
-@@ -1079,7 +1079,7 @@ int mp_register_gsi(u32 gsi, int trigger
- static int gsi_to_irq[MAX_GSI_NUM];
+ void notify_arch_cmos_timer(void)
+ {
+- mod_timer(&sync_cmos_timer, jiffies + 1);
++ if (!no_sync_cmos_clock)
++ mod_timer(&sync_cmos_timer, jiffies + 1);
+ mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
+ }
- /* Don't set up the ACPI SCI because it's already set up */
-- if (acpi_fadt.sci_int == gsi)
-+ if (acpi_gbl_FADT.sci_interrupt == gsi)
- return gsi;
+@@ -958,29 +767,11 @@ static int time_init_device(void)
- ioapic = mp_find_ioapic(gsi);
-@@ -1136,7 +1136,7 @@ int mp_register_gsi(u32 gsi, int trigger
- /*
- * Don't assign IRQ used by ACPI SCI
- */
-- if (gsi == acpi_fadt.sci_int)
-+ if (gsi == acpi_gbl_FADT.sci_interrupt)
- gsi = pci_irq++;
- gsi_to_irq[irq] = gsi;
- } else {
---- a/arch/x86/kernel/mpparse_64-xen.c
-+++ b/arch/x86/kernel/mpparse_64-xen.c
-@@ -60,9 +60,9 @@ unsigned long mp_lapic_addr = 0;
- /* Processor that is doing the boot up */
- unsigned int boot_cpu_id = -1U;
- /* Internal processor count */
--unsigned int num_processors __initdata = 0;
-+unsigned int num_processors __cpuinitdata = 0;
+ device_initcall(time_init_device);
--unsigned disabled_cpus __initdata;
-+unsigned disabled_cpus __cpuinitdata;
+-#ifdef CONFIG_HPET_TIMER
+ extern void (*late_time_init)(void);
+-/* Duplicate of time_init() below, with hpet_enable part added */
+-static void __init hpet_time_init(void)
+-{
+- struct timespec ts;
+- ts.tv_sec = get_cmos_time();
+- ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
+-
+- do_settimeofday(&ts);
+-
+- if ((hpet_enable() >= 0) && hpet_use_timer) {
+- printk("Using HPET for base-timer\n");
+- }
+-
+- do_time_init();
+-}
+-#endif
- /* Bitmask of physically existing CPUs */
- physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
-@@ -808,7 +808,7 @@ int mp_register_gsi(u32 gsi, int trigger
- return gsi;
+ /* Dynamically-mapped IRQ. */
+ DEFINE_PER_CPU(int, timer_irq);
- /* Don't set up the ACPI SCI because it's already set up */
-- if (acpi_fadt.sci_int == gsi)
-+ if (acpi_gbl_FADT.sci_interrupt == gsi)
- return gsi;
+-extern void (*late_time_init)(void);
+ static void setup_cpu0_timer_irq(void)
+ {
+ per_cpu(timer_irq, 0) =
+@@ -988,7 +779,7 @@ static void setup_cpu0_timer_irq(void)
+ VIRQ_TIMER,
+ 0,
+ timer_interrupt,
+- SA_INTERRUPT,
++ IRQF_DISABLED|IRQF_NOBALANCING,
+ "timer0",
+ NULL);
+ BUG_ON(per_cpu(timer_irq, 0) < 0);
+@@ -1000,16 +791,9 @@ static struct vcpu_set_periodic_timer xe
- ioapic = mp_find_ioapic(gsi);
---- a/arch/x86/kernel/pci-dma-xen.c
-+++ b/arch/x86/kernel/pci-dma-xen.c
-@@ -311,7 +311,7 @@ int dma_declare_coherent_memory(struct d
- return DMA_MEMORY_IO;
+ void __init time_init(void)
+ {
+-#ifdef CONFIG_HPET_TIMER
+- if (is_hpet_capable()) {
+- /*
+- * HPET initialization needs to do memory-mapped io. So, let
+- * us do a late initialization after mem_init().
+- */
+- late_time_init = hpet_time_init;
+- return;
+- }
+-#endif
++ init_cpu_khz();
++ printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
++ cpu_khz / 1000, cpu_khz % 1000);
- free1_out:
-- kfree(dev->dma_mem->bitmap);
-+ kfree(dev->dma_mem);
- out:
- if (mem_base)
- iounmap(mem_base);
---- a/arch/x86/kernel/pcspeaker.c
-+++ b/arch/x86/kernel/pcspeaker.c
-@@ -7,6 +7,11 @@ static __init int add_pcspkr(void)
- struct platform_device *pd;
- int ret;
+ switch (HYPERVISOR_vcpu_op(VCPUOP_set_periodic_timer, 0,
+ &xen_set_periodic_tick)) {
+@@ -1028,18 +812,12 @@ void __init time_init(void)
+ per_cpu(processed_system_time, 0) = processed_system_time;
+ init_missing_ticks_accounting(0);
-+#ifdef CONFIG_XEN
-+ if (!is_initial_xendomain())
-+ return 0;
-+#endif
-+
- pd = platform_device_alloc("pcspkr", -1);
- if (!pd)
- return -ENOMEM;
---- a/arch/x86/kernel/process_32-xen.c
-+++ b/arch/x86/kernel/process_32-xen.c
-@@ -38,6 +38,7 @@
- #include <linux/ptrace.h>
- #include <linux/random.h>
- #include <linux/personality.h>
-+#include <linux/tick.h>
+- update_wallclock();
++ clocksource_register(&clocksource_xen);
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-@@ -160,6 +161,7 @@ void cpu_idle(void)
+-#ifdef CONFIG_X86_64
+- init_cpu_khz();
+- printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
+- cpu_khz / 1000, cpu_khz % 1000);
++ update_wallclock();
- /* endless idle loop with no priority at all */
- while (1) {
-+ tick_nohz_stop_sched_tick();
- while (!need_resched()) {
- void (*idle)(void);
+- vxtime.mode = VXTIME_TSC;
+- vxtime.quot = (1000000L << 32) / vxtime_hz;
+- vxtime.tsc_quot = (1000L << 32) / cpu_khz;
+- sync_core();
+- rdtscll(vxtime.last_tsc);
++#ifndef CONFIG_X86_64
++ use_tsc_delay();
+ #endif
-@@ -175,6 +177,7 @@ void cpu_idle(void)
- __get_cpu_var(irq_stat).idle_timestamp = jiffies;
- idle();
- }
-+ tick_nohz_restart_sched_tick();
- preempt_enable_no_resched();
- schedule();
- preempt_disable();
-@@ -247,8 +250,8 @@ void show_regs(struct pt_regs * regs)
- regs->eax,regs->ebx,regs->ecx,regs->edx);
- printk("ESI: %08lx EDI: %08lx EBP: %08lx",
- regs->esi, regs->edi, regs->ebp);
-- printk(" DS: %04x ES: %04x GS: %04x\n",
-- 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xgs);
-+ printk(" DS: %04x ES: %04x FS: %04x\n",
-+ 0xffff & regs->xds,0xffff & regs->xes, 0xffff & regs->xfs);
+ /* Cannot request_irq() until kmem is initialised. */
+@@ -1196,7 +974,7 @@ int __cpuinit local_setup_timer(unsigned
+ irq = bind_virq_to_irqhandler(VIRQ_TIMER,
+ cpu,
+ timer_interrupt,
+- SA_INTERRUPT,
++ IRQF_DISABLED|IRQF_NOBALANCING,
+ timer_name[cpu],
+ NULL);
+ if (irq < 0)
+@@ -1285,7 +1063,7 @@ static ctl_table xen_table[] = {
+ };
+ static int __init xen_sysctl_init(void)
+ {
+- (void)register_sysctl_table(xen_table, 0);
++ (void)register_sysctl_table(xen_table);
+ return 0;
+ }
+ __initcall(xen_sysctl_init);
+--- sle11-2009-05-14.orig/arch/x86/kernel/traps_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/traps_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -100,6 +100,7 @@ asmlinkage void fixup_4gb_segment(void);
+ asmlinkage void machine_check(void);
- cr0 = read_cr0();
- cr2 = read_cr2();
-@@ -279,7 +282,7 @@ int kernel_thread(int (*fn)(void *), voi
+ int kstack_depth_to_print = 24;
++static unsigned int code_bytes = 64;
+ ATOMIC_NOTIFIER_HEAD(i386die_chain);
- regs.xds = __USER_DS;
- regs.xes = __USER_DS;
-- regs.xgs = __KERNEL_PDA;
-+ regs.xfs = __KERNEL_PDA;
- regs.orig_eax = -1;
- regs.eip = (unsigned long) kernel_thread_helper;
- regs.xcs = __KERNEL_CS | get_kernel_rpl();
-@@ -356,7 +359,7 @@ int copy_thread(int nr, unsigned long cl
+ int register_die_notifier(struct notifier_block *nb)
+@@ -297,10 +298,11 @@ void show_registers(struct pt_regs *regs
+ int i;
+ int in_kernel = 1;
+ unsigned long esp;
+- unsigned short ss;
++ unsigned short ss, gs;
- p->thread.eip = (unsigned long) ret_from_fork;
+ esp = (unsigned long) (®s->esp);
+ savesegment(ss, ss);
++ savesegment(gs, gs);
+ if (user_mode_vm(regs)) {
+ in_kernel = 0;
+ esp = regs->esp;
+@@ -319,8 +321,8 @@ void show_registers(struct pt_regs *regs
+ regs->eax, regs->ebx, regs->ecx, regs->edx);
+ printk(KERN_EMERG "esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n",
+ regs->esi, regs->edi, regs->ebp, esp);
+- printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
+- regs->xds & 0xffff, regs->xes & 0xffff, ss);
++ printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n",
++ regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
+ printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
+ TASK_COMM_LEN, current->comm, current->pid,
+ current_thread_info(), current, current->thread_info);
+@@ -330,7 +332,8 @@ void show_registers(struct pt_regs *regs
+ */
+ if (in_kernel) {
+ u8 *eip;
+- int code_bytes = 64;
++ unsigned int code_prologue = code_bytes * 43 / 64;
++ unsigned int code_len = code_bytes;
+ unsigned char c;
-- savesegment(fs,p->thread.fs);
-+ savesegment(gs,p->thread.gs);
+ printk("\n" KERN_EMERG "Stack: ");
+@@ -338,14 +341,14 @@ void show_registers(struct pt_regs *regs
- tsk = current;
- if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) {
-@@ -434,8 +437,8 @@ void dump_thread(struct pt_regs * regs,
- dump->regs.eax = regs->eax;
- dump->regs.ds = regs->xds;
- dump->regs.es = regs->xes;
-- savesegment(fs,dump->regs.fs);
-- dump->regs.gs = regs->xgs;
-+ dump->regs.fs = regs->xfs;
-+ savesegment(gs,dump->regs.gs);
- dump->regs.orig_eax = regs->orig_eax;
- dump->regs.eip = regs->eip;
- dump->regs.cs = regs->xcs;
-@@ -637,16 +640,6 @@ struct task_struct fastcall * __switch_t
- prefetch(&next->i387.fxsave);
+ printk(KERN_EMERG "Code: ");
- /*
-- * Restore %fs if needed.
-- *
-- * Glibc normally makes %fs be zero.
-- */
-- if (unlikely(next->fs))
-- loadsegment(fs, next->fs);
--
-- write_pda(pcurrent, next_p);
--
-- /*
- * Now maybe handle debug registers
- */
- if (unlikely(task_thread_info(next_p)->flags & _TIF_WORK_CTXSW))
-@@ -654,6 +647,15 @@ struct task_struct fastcall * __switch_t
-
- disable_tsc(prev_p, next_p);
-
-+ /*
-+ * Leave lazy mode, flushing any hypercalls made here.
-+ * This must be done before restoring TLS segments so
-+ * the GDT and LDT are properly updated, and must be
-+ * done before math_state_restore, so the TS bit is up
-+ * to date.
-+ */
-+ arch_leave_lazy_cpu_mode();
-+
- /* If the task has used fpu the last 5 timeslices, just do a full
- * restore of the math state immediately to avoid the trap; the
- * chances of needing FPU soon are obviously high now
-@@ -661,6 +663,14 @@ struct task_struct fastcall * __switch_t
- if (next_p->fpu_counter > 5)
- math_state_restore();
-
-+ /*
-+ * Restore %gs if needed (which is common)
-+ */
-+ if (prev->gs | next->gs)
-+ loadsegment(gs, next->gs);
+- eip = (u8 *)regs->eip - 43;
++ eip = (u8 *)regs->eip - code_prologue;
+ if (eip < (u8 *)PAGE_OFFSET ||
+ probe_kernel_address(eip, c)) {
+ /* try starting at EIP */
+ eip = (u8 *)regs->eip;
+- code_bytes = 32;
++ code_len = code_len - code_prologue + 1;
+ }
+- for (i = 0; i < code_bytes; i++, eip++) {
++ for (i = 0; i < code_len; i++, eip++) {
+ if (eip < (u8 *)PAGE_OFFSET ||
+ probe_kernel_address(eip, c)) {
+ printk(" Bad EIP value.");
+@@ -1134,3 +1137,13 @@ static int __init kstack_setup(char *s)
+ return 1;
+ }
+ __setup("kstack=", kstack_setup);
+
-+ write_pda(pcurrent, next_p);
++static int __init code_bytes_setup(char *s)
++{
++ code_bytes = simple_strtoul(s, NULL, 0);
++ if (code_bytes > 8192)
++ code_bytes = 8192;
+
- return prev_p;
++ return 1;
++}
++__setup("code_bytes=", code_bytes_setup);
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -46,43 +46,17 @@ int unregister_page_fault_notifier(struc
}
+ EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
---- a/arch/x86/kernel/process_64-xen.c
-+++ b/arch/x86/kernel/process_64-xen.c
-@@ -338,14 +338,17 @@ void load_gs_index(unsigned gs)
- void flush_thread(void)
+-static inline int notify_page_fault(enum die_val val, const char *str,
+- struct pt_regs *regs, long err, int trap, int sig)
++static inline int notify_page_fault(struct pt_regs *regs, long err)
{
- struct task_struct *tsk = current;
-- struct thread_info *t = current_thread_info();
+ struct die_args args = {
+ .regs = regs,
+- .str = str,
++ .str = "page fault",
+ .err = err,
+- .trapnr = trap,
+- .signr = sig
++ .trapnr = 14,
++ .signr = SIGSEGV
+ };
+- return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args);
+-}
+-
+-/*
+- * Unlock any spinlocks which will prevent us from getting the
+- * message out
+- */
+-void bust_spinlocks(int yes)
+-{
+- int loglevel_save = console_loglevel;
+-
+- if (yes) {
+- oops_in_progress = 1;
+- return;
+- }
+-#ifdef CONFIG_VT
+- unblank_screen();
+-#endif
+- oops_in_progress = 0;
+- /*
+- * OK, the message is on the console. Now we call printk()
+- * without oops_in_progress set so that printk will give klogd
+- * a poke. Hold onto your hats...
+- */
+- console_loglevel = 15; /* NMI oopser may have shut the console up */
+- printk(" ");
+- console_loglevel = loglevel_save;
++ return atomic_notifier_call_chain(¬ify_page_fault_chain,
++ DIE_PAGE_FAULT, &args);
+ }
-- if (t->flags & _TIF_ABI_PENDING) {
-- t->flags ^= (_TIF_ABI_PENDING | _TIF_IA32);
-- if (t->flags & _TIF_IA32)
-+ if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
-+ clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
-+ if (test_tsk_thread_flag(tsk, TIF_IA32)) {
-+ clear_tsk_thread_flag(tsk, TIF_IA32);
-+ } else {
-+ set_tsk_thread_flag(tsk, TIF_IA32);
- current_thread_info()->status |= TS_COMPAT;
-+ }
+ /*
+@@ -476,8 +450,7 @@ fastcall void __kprobes do_page_fault(st
+ /* Can take a spurious fault if mapping changes R/O -> R/W. */
+ if (spurious_fault(regs, address, error_code))
+ return;
+- if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
+- SIGSEGV) == NOTIFY_STOP)
++ if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
+ return;
+ /*
+ * Don't take the mm semaphore here. If we fixup a prefetch
+@@ -486,8 +459,7 @@ fastcall void __kprobes do_page_fault(st
+ goto bad_area_nosemaphore;
}
-- t->flags &= ~_TIF_DEBUG;
-+ clear_tsk_thread_flag(tsk, TIF_DEBUG);
- tsk->thread.debugreg0 = 0;
- tsk->thread.debugreg1 = 0;
---- a/arch/x86/kernel/setup_32-xen.c
-+++ b/arch/x86/kernel/setup_32-xen.c
-@@ -33,7 +33,6 @@
- #include <linux/initrd.h>
- #include <linux/bootmem.h>
- #include <linux/seq_file.h>
--#include <linux/platform_device.h>
- #include <linux/console.h>
- #include <linux/mca.h>
- #include <linux/root_dev.h>
-@@ -148,7 +147,7 @@ unsigned long saved_videomode;
- #define RAMDISK_PROMPT_FLAG 0x8000
- #define RAMDISK_LOAD_FLAG 0x4000
+- if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
+- SIGSEGV) == NOTIFY_STOP)
++ if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
+ return;
--static char command_line[COMMAND_LINE_SIZE];
-+static char __initdata command_line[COMMAND_LINE_SIZE];
+ /* It's safe to allow irq's after cr2 has been saved and the vmalloc
+--- sle11-2009-05-14.orig/arch/x86/mm/highmem_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/highmem_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -33,14 +33,16 @@ static void *__kmap_atomic(struct page *
- unsigned char __initdata boot_params[PARAM_SIZE];
+ /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
+ pagefault_disable();
++
++ idx = type + KM_TYPE_NR*smp_processor_id();
++ BUG_ON(!pte_none(*(kmap_pte-idx)));
++
+ if (!PageHighMem(page))
+ return page_address(page);
-@@ -647,8 +646,8 @@ void __init setup_arch(char **cmdline_p)
+- idx = type + KM_TYPE_NR*smp_processor_id();
+ vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+- if (!pte_none(*(kmap_pte-idx)))
+- BUG();
+ set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));
++ /*arch_flush_lazy_mmu_mode();*/
- if ((i = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE)
- i = COMMAND_LINE_SIZE;
-- memcpy(saved_command_line, xen_start_info->cmd_line, i);
-- saved_command_line[i - 1] = '\0';
-+ memcpy(boot_command_line, xen_start_info->cmd_line, i);
-+ boot_command_line[i - 1] = '\0';
- parse_early_param();
+ return (void*) vaddr;
+ }
+@@ -94,6 +96,7 @@ void *kmap_atomic_pfn(unsigned long pfn,
+ idx = type + KM_TYPE_NR*smp_processor_id();
+ vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+ set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot));
++ /*arch_flush_lazy_mmu_mode();*/
- if (user_defined_memmap) {
-@@ -656,11 +655,19 @@ void __init setup_arch(char **cmdline_p)
- print_memory_map("user");
+ return (void*) vaddr;
+ }
+--- sle11-2009-05-14.orig/arch/x86/mm/init_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -66,6 +66,7 @@ static pmd_t * __init one_md_table_init(
+
+ #ifdef CONFIG_X86_PAE
+ pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++ paravirt_alloc_pd(__pa(pmd_table) >> PAGE_SHIFT);
+ make_lowmem_page_readonly(pmd_table, XENFEAT_writable_page_tables);
+ set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
+ pud = pud_offset(pgd, 0);
+@@ -87,6 +88,7 @@ static pte_t * __init one_page_table_ini
+ {
+ if (pmd_none(*pmd)) {
+ pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++ paravirt_alloc_pt(__pa(page_table) >> PAGE_SHIFT);
+ make_lowmem_page_readonly(page_table,
+ XENFEAT_writable_page_tables);
+ set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
+--- sle11-2009-05-14.orig/arch/x86/mm/pgtable_32-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pgtable_32-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -149,6 +149,8 @@ void __set_fixmap (enum fixed_addresses
+ void __init reserve_top_address(unsigned long reserve)
+ {
+ BUG_ON(fixmaps > 0);
++ printk(KERN_INFO "Reserving virtual address space above 0x%08x\n",
++ (int)-reserve);
+ __FIXADDR_TOP = -reserve - PAGE_SIZE;
+ __VMALLOC_RESERVE += reserve;
+ }
+@@ -258,6 +260,12 @@ void pgd_ctor(void *pgd, struct kmem_cac
+ swapper_pg_dir + USER_PTRS_PER_PGD,
+ KERNEL_PGD_PTRS);
+ memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
++
++ /* must happen under lock */
++ paravirt_alloc_pd_clone(__pa(pgd) >> PAGE_SHIFT,
++ __pa(swapper_pg_dir) >> PAGE_SHIFT,
++ USER_PTRS_PER_PGD, PTRS_PER_PGD - USER_PTRS_PER_PGD);
++
+ pgd_list_add(pgd);
+ spin_unlock_irqrestore(&pgd_lock, flags);
}
+@@ -268,6 +276,7 @@ void pgd_dtor(void *pgd, struct kmem_cac
+ {
+ unsigned long flags; /* can be called from interrupt context */
-- strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
-+ strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
- *cmdline_p = command_line;
++ paravirt_release_pd(__pa(pgd) >> PAGE_SHIFT);
+ spin_lock_irqsave(&pgd_lock, flags);
+ pgd_list_del(pgd);
+ spin_unlock_irqrestore(&pgd_lock, flags);
+@@ -292,6 +301,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
+ if (!pmd)
+ goto out_oom;
++ paravirt_alloc_pd(__pa(pmd) >> PAGE_SHIFT);
+ set_pgd(&pgd[i], __pgd(1 + __pa(pmd)));
+ }
+ return pgd;
+@@ -314,6 +324,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ pmd[i] = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
+ if (!pmd[i])
+ goto out_oom;
++ paravirt_alloc_pd(__pa(pmd) >> PAGE_SHIFT);
+ }
- max_low_pfn = setup_memory();
+ spin_lock_irqsave(&pgd_lock, flags);
+@@ -354,12 +365,17 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
-+#ifdef CONFIG_VMI
-+ /*
-+ * Must be after max_low_pfn is determined, and before kernel
-+ * pagetables are setup.
+ out_oom:
+ if (HAVE_SHARED_KERNEL_PMD) {
+- for (i--; i >= 0; i--)
+- kmem_cache_free(pmd_cache,
+- (void *)__va(pgd_val(pgd[i])-1));
++ for (i--; i >= 0; i--) {
++ pgd_t pgdent = pgd[i];
++ void* pmd = (void *)__va(pgd_val(pgdent)-1);
++ paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
++ kmem_cache_free(pmd_cache, pmd);
++ }
+ } else {
+- for (i--; i >= 0; i--)
++ for (i--; i >= 0; i--) {
++ paravirt_release_pd(__pa(pmd[i]) >> PAGE_SHIFT);
+ kmem_cache_free(pmd_cache, pmd[i]);
++ }
+ kfree(pmd);
+ }
+ kmem_cache_free(pgd_cache, pgd);
+@@ -383,7 +399,9 @@ void pgd_free(pgd_t *pgd)
+ /* in the PAE case user pgd entries are overwritten before usage */
+ if (PTRS_PER_PMD > 1) {
+ for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+- pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
++ pgd_t pgdent = pgd[i];
++ void* pmd = (void *)__va(pgd_val(pgdent)-1);
++ paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
+ kmem_cache_free(pmd_cache, pmd);
+ }
+
+--- sle11-2009-05-14.orig/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/ia32/ia32entry-xen.S 2009-03-04 11:25:55.000000000 +0100
+@@ -465,7 +465,7 @@ ia32_sys_call_table:
+ .quad sys32_vm86_warning /* vm86old */
+ .quad compat_sys_wait4
+ .quad sys_swapoff /* 115 */
+- .quad sys32_sysinfo
++ .quad compat_sys_sysinfo
+ .quad sys32_ipc
+ .quad sys_fsync
+ .quad stub32_sigreturn
+@@ -510,7 +510,7 @@ ia32_sys_call_table:
+ .quad sys_sched_yield
+ .quad sys_sched_get_priority_max
+ .quad sys_sched_get_priority_min /* 160 */
+- .quad sys_sched_rr_get_interval
++ .quad sys32_sched_rr_get_interval
+ .quad compat_sys_nanosleep
+ .quad sys_mremap
+ .quad sys_setresuid16
+@@ -668,4 +668,5 @@ ia32_sys_call_table:
+ .quad compat_sys_vmsplice
+ .quad compat_sys_move_pages
+ .quad sys_getcpu
++ .quad sys_epoll_pwait
+ ia32_syscall_end:
+--- sle11-2009-05-14.orig/arch/x86/kernel/acpi/sleep_64-xen.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/arch/x86/kernel/acpi/sleep_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -59,7 +59,7 @@ unsigned long acpi_wakeup_address = 0;
+ unsigned long acpi_video_flags;
+ extern char wakeup_start, wakeup_end;
+
+-extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
++extern unsigned long acpi_copy_wakeup_routine(unsigned long);
+
+ static pgd_t low_ptr;
+
+@@ -67,8 +67,10 @@ static void init_low_mapping(void)
+ {
+ pgd_t *slot0 = pgd_offset(current->mm, 0UL);
+ low_ptr = *slot0;
++ /* FIXME: We're playing with the current task's page tables here, which
++ * is potentially dangerous on SMP systems.
+ */
-+ vmi_init();
-+#endif
-+
- /*
- * NOTE: before this point _nobody_ is allowed to allocate
- * any memory using the bootmem allocator. Although the
-@@ -823,7 +830,6 @@ void __init setup_arch(char **cmdline_p)
- conswitchp = &dummy_con;
+ set_pgd(slot0, *pgd_offset(current->mm, PAGE_OFFSET));
+- WARN_ON(num_online_cpus() != 1);
+ local_flush_tlb();
+ }
#endif
+--- sle11-2009-05-14.orig/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/e820_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -88,6 +88,13 @@ static inline int bad_addr(unsigned long
+ return 1;
}
-- tsc_init();
- }
- static int
-@@ -833,31 +839,3 @@ xen_panic_event(struct notifier_block *t
- /* we're never actually going to get here... */
- return NOTIFY_DONE;
++#ifdef CONFIG_NUMA
++ /* NUMA memory to node map */
++ if (last >= nodemap_addr && addr < nodemap_addr + nodemap_size) {
++ *addrp = nodemap_addr + nodemap_size;
++ return 1;
++ }
++#endif
+ /* XXX ramdisk image here? */
+ #else
+ if (last < (table_end<<PAGE_SHIFT)) {
+@@ -213,6 +220,37 @@ unsigned long __init e820_end_of_ram(voi
}
--
--static __init int add_pcspkr(void)
--{
-- struct platform_device *pd;
-- int ret;
--
-- if (!is_initial_xendomain())
-- return 0;
--
-- pd = platform_device_alloc("pcspkr", -1);
-- if (!pd)
-- return -ENOMEM;
--
-- ret = platform_device_add(pd);
-- if (ret)
-- platform_device_put(pd);
--
-- return ret;
--}
--device_initcall(add_pcspkr);
--
--/*
-- * Local Variables:
-- * mode:c
-- * c-file-style:"k&r"
-- * c-basic-offset:8
-- * End:
-- */
---- a/arch/x86/kernel/setup_64-xen.c
-+++ b/arch/x86/kernel/setup_64-xen.c
-@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(edid_info);
- extern int root_mountflags;
+ /*
++ * Find the hole size in the range.
++ */
++unsigned long __init e820_hole_size(unsigned long start, unsigned long end)
++{
++ unsigned long ram = 0;
++ int i;
++
++ for (i = 0; i < e820.nr_map; i++) {
++ struct e820entry *ei = &e820.map[i];
++ unsigned long last, addr;
++
++ if (ei->type != E820_RAM ||
++ ei->addr+ei->size <= start ||
++ ei->addr >= end)
++ continue;
++
++ addr = round_up(ei->addr, PAGE_SIZE);
++ if (addr < start)
++ addr = start;
++
++ last = round_down(ei->addr + ei->size, PAGE_SIZE);
++ if (last >= end)
++ last = end;
++
++ if (last > addr)
++ ram += last - addr;
++ }
++ return ((end - start) - ram);
++}
++
++/*
+ * Mark e820 reserved areas as busy for the resource manager.
+ */
+ void __init e820_reserve_resources(struct e820entry *e820, int nr_map)
+@@ -738,7 +776,7 @@ static int __init parse_memmap_opt(char
+ }
+ early_param("memmap", parse_memmap_opt);
--char command_line[COMMAND_LINE_SIZE];
-+char __initdata command_line[COMMAND_LINE_SIZE];
+-void finish_e820_parsing(void)
++void __init finish_e820_parsing(void)
+ {
+ if (userdef) {
+ printk(KERN_INFO "user-defined physical RAM map:\n");
+--- sle11-2009-05-14.orig/arch/x86/kernel/entry_64-xen.S 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/entry_64-xen.S 2009-03-04 11:25:55.000000000 +0100
+@@ -629,6 +629,9 @@ END(invalidate_interrupt\num)
+ ENTRY(call_function_interrupt)
+ apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
+ END(call_function_interrupt)
++ENTRY(irq_move_cleanup_interrupt)
++ apicinterrupt IRQ_MOVE_CLEANUP_VECTOR,smp_irq_move_cleanup_interrupt
++END(irq_move_cleanup_interrupt)
+ #endif
- struct resource standard_io_resources[] = {
- { .name = "dma1", .start = 0x00, .end = 0x1f,
-@@ -179,134 +179,6 @@ struct resource code_resource = {
- .flags = IORESOURCE_RAM,
- };
+ ENTRY(apic_timer_interrupt)
+--- sle11-2009-05-14.orig/arch/x86/kernel/genapic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/genapic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -65,8 +65,8 @@ void __init clustered_apic_check(void)
+ * Some x86_64 machines use physical APIC mode regardless of how many
+ * procs/clusters are present (x86_64 ES7000 is an example).
+ */
+- if (acpi_fadt.revision > FADT2_REVISION_ID)
+- if (acpi_fadt.force_apic_physical_destination_mode) {
++ if (acpi_gbl_FADT.header.revision > FADT2_REVISION_ID)
++ if (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) {
+ genapic = &apic_cluster;
+ goto print;
+ }
+--- sle11-2009-05-14.orig/arch/x86/kernel/head64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/head64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -45,8 +45,6 @@ static void __init clear_bss(void)
+ #define OLD_CL_BASE_ADDR 0x90000
+ #define OLD_CL_OFFSET 0x90022
--#define IORESOURCE_ROM (IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM)
--
--static struct resource system_rom_resource = {
-- .name = "System ROM",
-- .start = 0xf0000,
-- .end = 0xfffff,
-- .flags = IORESOURCE_ROM,
--};
--
--static struct resource extension_rom_resource = {
-- .name = "Extension ROM",
-- .start = 0xe0000,
-- .end = 0xeffff,
-- .flags = IORESOURCE_ROM,
--};
--
--static struct resource adapter_rom_resources[] = {
-- { .name = "Adapter ROM", .start = 0xc8000, .end = 0,
-- .flags = IORESOURCE_ROM },
-- { .name = "Adapter ROM", .start = 0, .end = 0,
-- .flags = IORESOURCE_ROM },
-- { .name = "Adapter ROM", .start = 0, .end = 0,
-- .flags = IORESOURCE_ROM },
-- { .name = "Adapter ROM", .start = 0, .end = 0,
-- .flags = IORESOURCE_ROM },
-- { .name = "Adapter ROM", .start = 0, .end = 0,
-- .flags = IORESOURCE_ROM },
-- { .name = "Adapter ROM", .start = 0, .end = 0,
-- .flags = IORESOURCE_ROM }
--};
--
--static struct resource video_rom_resource = {
-- .name = "Video ROM",
-- .start = 0xc0000,
-- .end = 0xc7fff,
-- .flags = IORESOURCE_ROM,
--};
--
--static struct resource video_ram_resource = {
-- .name = "Video RAM area",
-- .start = 0xa0000,
-- .end = 0xbffff,
-- .flags = IORESOURCE_RAM,
--};
+-extern char saved_command_line[];
-
--#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
--
--static int __init romchecksum(unsigned char *rom, unsigned long length)
--{
-- unsigned char *p, sum = 0;
--
-- for (p = rom; p < rom + length; p++)
-- sum += *p;
-- return sum == 0;
--}
+ static void __init copy_bootdata(char *real_mode_data)
+ {
+ #ifndef CONFIG_XEN
+@@ -62,14 +60,14 @@ static void __init copy_bootdata(char *r
+ new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
+ }
+ command_line = (char *) ((u64)(new_data));
+- memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
++ memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+ #else
+ int max_cmdline;
+
+ if ((max_cmdline = MAX_GUEST_CMDLINE) > COMMAND_LINE_SIZE)
+ max_cmdline = COMMAND_LINE_SIZE;
+- memcpy(saved_command_line, xen_start_info->cmd_line, max_cmdline);
+- saved_command_line[max_cmdline-1] = '\0';
++ memcpy(boot_command_line, xen_start_info->cmd_line, max_cmdline);
++ boot_command_line[max_cmdline-1] = '\0';
+ #endif
+ }
+
+--- sle11-2009-05-14.orig/arch/x86/kernel/io_apic_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/io_apic_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -36,6 +36,7 @@
+ #include <acpi/acpi_bus.h>
+ #endif
+
++#include <asm/idle.h>
+ #include <asm/io.h>
+ #include <asm/smp.h>
+ #include <asm/desc.h>
+@@ -47,7 +48,20 @@
+ #include <asm/msidef.h>
+ #include <asm/hypertransport.h>
+
+-static int assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result);
++struct irq_cfg {
++#ifndef CONFIG_XEN
++ cpumask_t domain;
++ cpumask_t old_domain;
++#endif
++ unsigned move_cleanup_count;
++ u8 vector;
++ u8 move_in_progress : 1;
++};
++
++/* irq_cfg is indexed by the sum of all RTEs in all I/O APICs. */
++struct irq_cfg irq_cfg[NR_IRQS] __read_mostly;
++
++static int assign_irq_vector(int irq, cpumask_t mask);
+
+ #define __apicdebuginit __init
+
+@@ -89,7 +103,7 @@ int nr_ioapic_registers[MAX_IO_APICS];
+ * Rough estimation of how many shared IRQs there are, can
+ * be changed anytime.
+ */
+-#define MAX_PLUS_SHARED_IRQS NR_IRQ_VECTORS
++#define MAX_PLUS_SHARED_IRQS NR_IRQS
+ #define PIN_MAP_SIZE (MAX_PLUS_SHARED_IRQS + NR_IRQS)
+
+ /*
+@@ -262,21 +276,19 @@ static void __target_IO_APIC_irq(unsigne
+
+ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
+ {
++ struct irq_cfg *cfg = irq_cfg + irq;
+ unsigned long flags;
+ unsigned int dest;
+ cpumask_t tmp;
+- int vector;
+
+ cpus_and(tmp, mask, cpu_online_map);
+ if (cpus_empty(tmp))
+- tmp = TARGET_CPUS;
-
--static void __init probe_roms(void)
+- cpus_and(mask, tmp, CPU_MASK_ALL);
++ return;
+
+- vector = assign_irq_vector(irq, mask, &tmp);
+- if (vector < 0)
++ if (assign_irq_vector(irq, mask))
+ return;
+
++ cpus_and(tmp, cfg->domain, mask);
+ dest = cpu_mask_to_apicid(tmp);
+
+ /*
+@@ -285,8 +297,8 @@ static void set_ioapic_affinity_irq(unsi
+ dest = SET_APIC_LOGICAL_ID(dest);
+
+ spin_lock_irqsave(&ioapic_lock, flags);
+- __target_IO_APIC_irq(irq, dest, vector);
+- set_native_irq_info(irq, mask);
++ __target_IO_APIC_irq(irq, dest, cfg->vector);
++ irq_desc[irq].affinity = mask;
+ spin_unlock_irqrestore(&ioapic_lock, flags);
+ }
+ #endif
+@@ -332,11 +344,11 @@ static void add_pin_to_irq(unsigned int
+ reg = io_apic_read(entry->apic, 0x10 + R + pin*2); \
+ reg ACTION; \
+ io_apic_modify(entry->apic, reg); \
++ FINAL; \
+ if (!entry->next) \
+ break; \
+ entry = irq_2_pin + entry->next; \
+ } \
+- FINAL; \
+ }
+
+ #define DO_ACTION(name,R,ACTION, FINAL) \
+@@ -669,77 +681,62 @@ static int pin_2_irq(int idx, int apic,
+ return irq;
+ }
+
+-static inline int IO_APIC_irq_trigger(int irq)
-{
-- unsigned long start, length, upper;
-- unsigned char *rom;
-- int i;
--
--#ifdef CONFIG_XEN
-- /* Nothing to do if not running in dom0. */
-- if (!is_initial_xendomain())
-- return;
--#endif
--
-- /* video rom */
-- upper = adapter_rom_resources[0].start;
-- for (start = video_rom_resource.start; start < upper; start += 2048) {
-- rom = isa_bus_to_virt(start);
-- if (!romsignature(rom))
-- continue;
--
-- video_rom_resource.start = start;
--
-- /* 0 < length <= 0x7f * 512, historically */
-- length = rom[2] * 512;
--
-- /* if checksum okay, trust length byte */
-- if (length && romchecksum(rom, length))
-- video_rom_resource.end = start + length - 1;
--
-- request_resource(&iomem_resource, &video_rom_resource);
-- break;
-- }
--
-- start = (video_rom_resource.end + 1 + 2047) & ~2047UL;
-- if (start < upper)
-- start = upper;
--
-- /* system rom */
-- request_resource(&iomem_resource, &system_rom_resource);
-- upper = system_rom_resource.start;
+- int apic, idx, pin;
-
-- /* check for extension rom (ignore length byte!) */
-- rom = isa_bus_to_virt(extension_rom_resource.start);
-- if (romsignature(rom)) {
-- length = extension_rom_resource.end - extension_rom_resource.start + 1;
-- if (romchecksum(rom, length)) {
-- request_resource(&iomem_resource, &extension_rom_resource);
-- upper = extension_rom_resource.start;
+- for (apic = 0; apic < nr_ioapics; apic++) {
+- for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) {
+- idx = find_irq_entry(apic,pin,mp_INT);
+- if ((idx != -1) && (irq == pin_2_irq(idx,apic,pin)))
+- return irq_trigger(idx);
- }
- }
--
-- /* check for adapter roms on 2k boundaries */
-- for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper;
-- start += 2048) {
-- rom = isa_bus_to_virt(start);
-- if (!romsignature(rom))
-- continue;
--
-- /* 0 < length <= 0x7f * 512, historically */
-- length = rom[2] * 512;
--
-- /* but accept any length that fits if checksum okay */
-- if (!length || start + length > upper || !romchecksum(rom, length))
-- continue;
--
-- adapter_rom_resources[i].start = start;
-- adapter_rom_resources[i].end = start + length - 1;
-- request_resource(&iomem_resource, &adapter_rom_resources[i]);
--
-- start = adapter_rom_resources[i++].end & ~2047UL;
-- }
+- /*
+- * nonexistent IRQs are edge default
+- */
+- return 0;
-}
-
- #ifdef CONFIG_PROC_VMCORE
- /* elfcorehdr= specifies the location of elf core header
- * stored by the crashed kernel. This option will be passed
-@@ -403,7 +275,7 @@ void __init setup_arch(char **cmdline_p)
- #ifdef CONFIG_XEN
- extern struct e820map machine_e820;
+-/* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
+-static u8 irq_vector[NR_IRQ_VECTORS] __read_mostly;
+-
+-static int __assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
++static int __assign_irq_vector(int irq, cpumask_t mask)
+ {
+- int vector;
+ struct physdev_irq irq_op;
++ struct irq_cfg *cfg;
+
+- BUG_ON((unsigned)irq >= NR_IRQ_VECTORS);
++ BUG_ON((unsigned)irq >= NR_IRQS);
-- printk(KERN_INFO "Command line: %s\n", saved_command_line);
-+ printk(KERN_INFO "Command line: %s\n", boot_command_line);
+ if (irq < PIRQ_BASE || irq - PIRQ_BASE >= NR_PIRQS)
+ return -EINVAL;
- /* Register a call for panic conditions. */
- atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
-@@ -430,7 +302,7 @@ void __init setup_arch(char **cmdline_p)
+- cpus_and(*result, mask, cpu_online_map);
++ cfg = &irq_cfg[irq];
++
++ if ((cfg->move_in_progress) || cfg->move_cleanup_count)
++ return -EBUSY;
- ARCH_SETUP
- #else
-- printk(KERN_INFO "Command line: %s\n", saved_command_line);
-+ printk(KERN_INFO "Command line: %s\n", boot_command_line);
+- if (irq_vector[irq] > 0)
+- return irq_vector[irq];
++ if (cfg->vector)
++ return 0;
- ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
- screen_info = SCREEN_INFO;
-@@ -461,7 +333,7 @@ void __init setup_arch(char **cmdline_p)
+ irq_op.irq = irq;
+ if (HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector, &irq_op))
+ return -ENOSPC;
- early_identify_cpu(&boot_cpu_data);
+- vector = irq_op.vector;
+- irq_vector[irq] = vector;
++ cfg->vector = irq_op.vector;
-- strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
-+ strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
- *cmdline_p = command_line;
+- return vector;
++ return 0;
+ }
- parse_early_param();
-@@ -531,6 +403,11 @@ void __init setup_arch(char **cmdline_p)
- /* reserve ebda region */
- if (ebda_addr)
- reserve_bootmem_generic(ebda_addr, ebda_size);
-+#ifdef CONFIG_NUMA
-+ /* reserve nodemap region */
-+ if (nodemap_addr)
-+ reserve_bootmem_generic(nodemap_addr, nodemap_size);
-+#endif
-
- #ifdef CONFIG_SMP
- /*
-@@ -731,10 +608,8 @@ void __init setup_arch(char **cmdline_p)
- #endif
-
- /*
-- * Request address space for all standard RAM and ROM resources
-- * and also for regions reported as reserved by the e820.
-+ * We trust e820 completely. No explicit ROM probing in memory.
- */
-- probe_roms();
- #ifdef CONFIG_XEN
- if (is_initial_xendomain())
- e820_reserve_resources(machine_e820.map, machine_e820.nr_map);
-@@ -743,8 +618,6 @@ void __init setup_arch(char **cmdline_p)
- e820_mark_nosave_regions();
- #endif
+-static int assign_irq_vector(int irq, cpumask_t mask, cpumask_t *result)
++static int assign_irq_vector(int irq, cpumask_t mask)
+ {
+- int vector;
++ int err;
+ unsigned long flags;
-- request_resource(&iomem_resource, &video_ram_resource);
--
- {
- unsigned i;
- /* request I/O space for devices used on all i[345]86 PCs */
-@@ -1321,7 +1194,8 @@ static int show_cpuinfo(struct seq_file
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
-- NULL, "fxsr_opt", NULL, "rdtscp", NULL, "lm", "3dnowext", "3dnow",
-+ NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",
-+ "3dnowext", "3dnow",
+ spin_lock_irqsave(&vector_lock, flags);
+- vector = __assign_irq_vector(irq, mask, result);
++ err = __assign_irq_vector(irq, mask);
+ spin_unlock_irqrestore(&vector_lock, flags);
+- return vector;
++ return err;
+ }
- /* Transmeta-defined */
- "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
-@@ -1339,7 +1213,7 @@ static int show_cpuinfo(struct seq_file
- /* Intel-defined (#2) */
- "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
- "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
-- NULL, NULL, "dca", NULL, NULL, NULL, NULL, NULL,
-+ NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ #ifndef CONFIG_XEN
+ static void __clear_irq_vector(int irq)
+ {
++ struct irq_cfg *cfg;
+ cpumask_t mask;
+ int cpu, vector;
- /* VIA/Cyrix/Centaur-defined */
-@@ -1349,8 +1223,10 @@ static int show_cpuinfo(struct seq_file
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+- BUG_ON(!irq_vector[irq]);
++ BUG_ON((unsigned)irq >= NR_IRQS);
++ cfg = &irq_cfg[irq];
++ BUG_ON(!cfg->vector);
- /* AMD-defined (#2) */
-- "lahf_lm", "cmp_legacy", "svm", NULL, "cr8_legacy", NULL, NULL, NULL,
-- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-+ "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy",
-+ "altmovcr8", "abm", "sse4a",
-+ "misalignsse", "3dnowprefetch",
-+ "osvw", "ibs", NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- };
-@@ -1361,6 +1237,9 @@ static int show_cpuinfo(struct seq_file
- "ttp", /* thermal trip */
- "tm",
- "stc",
-+ "100mhzsteps",
-+ "hwpstate",
-+ NULL, /* tsc invariant mapped to constant_tsc */
- NULL,
- /* nothing */ /* constant_tsc - moved to flags */
- };
-@@ -1477,26 +1356,3 @@ struct seq_operations cpuinfo_op = {
- .stop = c_stop,
- .show = show_cpuinfo,
- };
--
--#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
--#include <linux/platform_device.h>
--static __init int add_pcspkr(void)
--{
-- struct platform_device *pd;
-- int ret;
--
-- if (!is_initial_xendomain())
-- return 0;
--
-- pd = platform_device_alloc("pcspkr", -1);
-- if (!pd)
-- return -ENOMEM;
--
-- ret = platform_device_add(pd);
-- if (ret)
-- platform_device_put(pd);
--
-- return ret;
--}
--device_initcall(add_pcspkr);
--#endif
---- a/arch/x86/kernel/smp_32-xen.c
-+++ b/arch/x86/kernel/smp_32-xen.c
-@@ -335,8 +335,7 @@ static void flush_tlb_others(cpumask_t c
- /*
- * i'm not happy about this global shared spinlock in the
- * MM hot path, but we'll see how contended it is.
-- * Temporarily this turns IRQs off, so that lockups are
-- * detected by the NMI watchdog.
-+ * AK: x86-64 has a faster method that could be ported.
- */
- spin_lock(&tlbstate_lock);
-
-@@ -361,7 +360,7 @@ static void flush_tlb_others(cpumask_t c
+- vector = irq_vector[irq];
+- cpus_and(mask, irq_domain[irq], cpu_online_map);
++ vector = cfg->vector;
++ cpus_and(mask, cfg->domain, cpu_online_map);
+ for_each_cpu_mask(cpu, mask)
+ per_cpu(vector_irq, cpu)[vector] = -1;
- while (!cpus_empty(flush_cpumask))
- /* nothing. lockup detection does not belong here */
-- mb();
-+ cpu_relax();
+- irq_vector[irq] = 0;
+- irq_domain[irq] = CPU_MASK_NONE;
++ cfg->vector = 0;
++ cfg->domain = CPU_MASK_NONE;
+ }
- flush_mm = NULL;
- flush_va = 0;
---- a/arch/x86/kernel/time_32-xen.c
-+++ b/arch/x86/kernel/time_32-xen.c
-@@ -51,6 +51,7 @@
- #include <linux/kernel_stat.h>
- #include <linux/posix-timers.h>
- #include <linux/cpufreq.h>
-+#include <linux/clocksource.h>
+ void __setup_vector_irq(int cpu)
+@@ -749,10 +746,10 @@ void __setup_vector_irq(int cpu)
+ int irq, vector;
- #include <asm/io.h>
- #include <asm/smp.h>
-@@ -75,25 +76,17 @@
- #include <xen/evtchn.h>
- #include <xen/interface/vcpu.h>
+ /* Mark the inuse vectors */
+- for (irq = 0; irq < NR_IRQ_VECTORS; ++irq) {
+- if (!cpu_isset(cpu, irq_domain[irq]))
++ for (irq = 0; irq < NR_IRQS; ++irq) {
++ if (!cpu_isset(cpu, irq_cfg[irq].domain))
+ continue;
+- vector = irq_vector[irq];
++ vector = irq_cfg[irq].vector;
+ per_cpu(vector_irq, cpu)[vector] = irq;
+ }
+ /* Mark the free vectors */
+@@ -760,41 +757,49 @@ void __setup_vector_irq(int cpu)
+ irq = per_cpu(vector_irq, cpu)[vector];
+ if (irq < 0)
+ continue;
+- if (!cpu_isset(cpu, irq_domain[irq]))
++ if (!cpu_isset(cpu, irq_cfg[irq].domain))
+ per_cpu(vector_irq, cpu)[vector] = -1;
+ }
+ }
--#if defined (__i386__)
--#include <asm/i8259.h>
-+#ifdef CONFIG_X86_32
- #include <asm/i8253.h>
- DEFINE_SPINLOCK(i8253_lock);
- EXPORT_SYMBOL(i8253_lock);
--#endif
--
--#define XEN_SHIFT 22
--
- int pit_latch_buggy; /* extern */
+-extern void (*interrupt[NR_IRQS])(void);
-
--#if defined(__x86_64__)
--unsigned long vxtime_hz = PIT_TICK_RATE;
--struct vxtime_data __vxtime __section_vxtime; /* for vsyscalls */
-+#else
- volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
--struct timespec __xtime __section_xtime;
--struct timezone __sys_tz __section_sys_tz;
- #endif
-
-+#define XEN_SHIFT 22
-+
- unsigned int cpu_khz; /* Detected as we calibrate the TSC */
- EXPORT_SYMBOL(cpu_khz);
-
-@@ -113,9 +106,6 @@ static DEFINE_PER_CPU(struct shadow_time
- static struct timespec shadow_tv;
- static u32 shadow_tv_version;
+ static struct irq_chip ioapic_chip;
--static struct timeval monotonic_tv;
--static spinlock_t monotonic_lock = SPIN_LOCK_UNLOCKED;
+-#define IOAPIC_AUTO -1
+-#define IOAPIC_EDGE 0
+-#define IOAPIC_LEVEL 1
-
- /* Keep track of last time we did processing/updating of jiffies and xtime. */
- static u64 processed_system_time; /* System time (ns) at last processing. */
- static DEFINE_PER_CPU(u64, processed_system_time);
-@@ -228,7 +218,7 @@ static inline u64 scale_delta(u64 delta,
- return product;
+-static void ioapic_register_intr(int irq, int vector, unsigned long trigger)
++static void ioapic_register_intr(int irq, unsigned long trigger)
+ {
+- if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
+- trigger == IOAPIC_LEVEL)
++ if (trigger)
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_fasteoi_irq, "fasteoi");
+- else {
+- irq_desc[irq].status |= IRQ_DELAYED_DISABLE;
++ else
+ set_irq_chip_and_handler_name(irq, &ioapic_chip,
+ handle_edge_irq, "edge");
+- }
}
+ #else
+-#define ioapic_register_intr(irq, vector, trigger) evtchn_register_pirq(irq)
++#define ioapic_register_intr(irq, trigger) evtchn_register_pirq(irq)
+ #endif /* !CONFIG_XEN */
--void init_cpu_khz(void)
-+static void init_cpu_khz(void)
+-static void __init setup_IO_APIC_irq(int apic, int pin, int idx, int irq)
++static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq,
++ int trigger, int polarity)
{
- u64 __cpu_khz = 1000000ULL << 32;
- struct vcpu_time_info *info = &vcpu_info(0)->time;
-@@ -247,16 +237,6 @@ static u64 get_nsec_offset(struct shadow
- return scale_delta(delta, shadow->tsc_to_nsec_mul, shadow->tsc_shift);
- }
++ struct irq_cfg *cfg = irq_cfg + irq;
+ struct IO_APIC_route_entry entry;
+- int vector;
+- unsigned long flags;
++ cpumask_t mask;
++
++ if (!IO_APIC_IRQ(irq))
++ return;
--#ifdef CONFIG_X86_64
--static unsigned long get_usec_offset(struct shadow_time_info *shadow)
--{
-- u64 now, delta;
-- rdtscll(now);
-- delta = now - shadow->tsc_timestamp;
-- return scale_delta(delta, shadow->tsc_to_usec_mul, shadow->tsc_shift);
--}
--#endif
--
- static void __update_wallclock(time_t sec, long nsec)
- {
- long wtm_nsec, xtime_nsec;
-@@ -371,138 +351,6 @@ void rtc_cmos_write(unsigned char val, u
- }
- EXPORT_SYMBOL(rtc_cmos_write);
++ mask = TARGET_CPUS;
++ if (assign_irq_vector(irq, mask))
++ return;
++
++#ifndef CONFIG_XEN
++ cpus_and(mask, cfg->domain, mask);
++#endif
++
++ apic_printk(APIC_VERBOSE,KERN_DEBUG
++ "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> "
++ "IRQ %d Mode:%i Active:%i)\n",
++ apic, mp_ioapics[apic].mpc_apicid, pin, cfg->vector,
++ irq, trigger, polarity);
--#ifdef CONFIG_X86_64
--
--/*
-- * This version of gettimeofday has microsecond resolution
-- * and better than microsecond precision on fast x86 machines with TSC.
-- */
--void do_gettimeofday(struct timeval *tv)
--{
-- unsigned long seq;
-- unsigned long usec, sec;
-- unsigned long flags;
-- s64 nsec;
-- unsigned int cpu;
-- struct shadow_time_info *shadow;
-- u32 local_time_version;
--
-- cpu = get_cpu();
-- shadow = &per_cpu(shadow_time, cpu);
--
-- do {
-- local_time_version = shadow->version;
-- seq = read_seqbegin(&xtime_lock);
--
-- usec = get_usec_offset(shadow);
--
-- sec = xtime.tv_sec;
-- usec += (xtime.tv_nsec / NSEC_PER_USEC);
--
-- nsec = shadow->system_timestamp - processed_system_time;
-- __normalize_time(&sec, &nsec);
-- usec += (long)nsec / NSEC_PER_USEC;
--
-- if (unlikely(!time_values_up_to_date(cpu))) {
-- /*
-- * We may have blocked for a long time,
-- * rendering our calculations invalid
-- * (e.g. the time delta may have
-- * overflowed). Detect that and recalculate
-- * with fresh values.
-- */
-- get_time_values_from_xen(cpu);
-- continue;
-- }
-- } while (read_seqretry(&xtime_lock, seq) ||
-- (local_time_version != shadow->version));
--
-- put_cpu();
--
-- while (usec >= USEC_PER_SEC) {
-- usec -= USEC_PER_SEC;
-- sec++;
-- }
+ /*
+ * add it to the IO-APIC irq-routing table:
+@@ -803,41 +808,23 @@ static void __init setup_IO_APIC_irq(int
+
+ entry.delivery_mode = INT_DELIVERY_MODE;
+ entry.dest_mode = INT_DEST_MODE;
++ entry.dest = cpu_mask_to_apicid(mask);
+ entry.mask = 0; /* enable IRQ */
+- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
-
-- spin_lock_irqsave(&monotonic_lock, flags);
-- if ((sec > monotonic_tv.tv_sec) ||
-- ((sec == monotonic_tv.tv_sec) && (usec > monotonic_tv.tv_usec)))
-- {
-- monotonic_tv.tv_sec = sec;
-- monotonic_tv.tv_usec = usec;
-- } else {
-- sec = monotonic_tv.tv_sec;
-- usec = monotonic_tv.tv_usec;
+- entry.trigger = irq_trigger(idx);
+- entry.polarity = irq_polarity(idx);
++ entry.trigger = trigger;
++ entry.polarity = polarity;
++ entry.vector = cfg->vector;
+
+- if (irq_trigger(idx)) {
+- entry.trigger = 1;
++ /* Mask level triggered irqs.
++ * Use IRQ_DELAYED_DISABLE for edge triggered irqs.
++ */
++ if (trigger)
+ entry.mask = 1;
+- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
- }
-- spin_unlock_irqrestore(&monotonic_lock, flags);
--
-- tv->tv_sec = sec;
-- tv->tv_usec = usec;
--}
--
--EXPORT_SYMBOL(do_gettimeofday);
--
--int do_settimeofday(struct timespec *tv)
--{
-- time_t sec;
-- s64 nsec;
-- unsigned int cpu;
-- struct shadow_time_info *shadow;
-- struct xen_platform_op op;
--
-- if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-- return -EINVAL;
-
-- cpu = get_cpu();
-- shadow = &per_cpu(shadow_time, cpu);
--
-- write_seqlock_irq(&xtime_lock);
+- if (/* !apic && */ !IO_APIC_IRQ(irq))
+- return;
+
+- if (IO_APIC_IRQ(irq)) {
+- cpumask_t mask;
+- vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
+- if (vector < 0)
+- return;
-
-- /*
-- * Ensure we don't get blocked for a long time so that our time delta
-- * overflows. If that were to happen then our shadow time values would
-- * be stale, so we can retry with fresh ones.
-- */
-- for (;;) {
-- nsec = tv->tv_nsec - get_nsec_offset(shadow);
-- if (time_values_up_to_date(cpu))
-- break;
-- get_time_values_from_xen(cpu);
-- }
-- sec = tv->tv_sec;
-- __normalize_time(&sec, &nsec);
+- entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+- entry.vector = vector;
-
-- if (is_initial_xendomain() && !independent_wallclock) {
-- op.cmd = XENPF_settime;
-- op.u.settime.secs = sec;
-- op.u.settime.nsecs = nsec;
-- op.u.settime.system_time = shadow->system_timestamp;
-- WARN_ON(HYPERVISOR_platform_op(&op));
-- update_wallclock();
-- } else if (independent_wallclock) {
-- nsec -= shadow->system_timestamp;
-- __normalize_time(&sec, &nsec);
-- __update_wallclock(sec, nsec);
+- ioapic_register_intr(irq, vector, IOAPIC_AUTO);
+- if (!apic && (irq < 16))
+- disable_8259A_irq(irq);
- }
++ ioapic_register_intr(irq, trigger);
++ if (irq < 16)
++ disable_8259A_irq(irq);
+
+ ioapic_write_entry(apic, pin, entry);
-
-- /* Reset monotonic gettimeofday() timeval. */
-- spin_lock(&monotonic_lock);
-- monotonic_tv.tv_sec = 0;
-- monotonic_tv.tv_usec = 0;
-- spin_unlock(&monotonic_lock);
--
-- write_sequnlock_irq(&xtime_lock);
--
-- put_cpu();
--
-- clock_was_set();
-- return 0;
--}
+- spin_lock_irqsave(&ioapic_lock, flags);
+- set_native_irq_info(irq, TARGET_CPUS);
+- spin_unlock_irqrestore(&ioapic_lock, flags);
-
--EXPORT_SYMBOL(do_settimeofday);
+ }
+
+ static void __init setup_IO_APIC_irqs(void)
+@@ -862,8 +849,8 @@ static void __init setup_IO_APIC_irqs(vo
+ irq = pin_2_irq(idx, apic, pin);
+ add_pin_to_irq(irq, apic, pin);
+
+- setup_IO_APIC_irq(apic, pin, idx, irq);
-
--#endif
++ setup_IO_APIC_irq(apic, pin, irq,
++ irq_trigger(idx), irq_polarity(idx));
+ }
+ }
+
+@@ -894,7 +881,7 @@ static void __init setup_ExtINT_IRQ0_pin
+ */
+ entry.dest_mode = INT_DEST_MODE;
+ entry.mask = 0; /* unmask IRQ now */
+- entry.dest.logical.logical_dest = cpu_mask_to_apicid(TARGET_CPUS);
++ entry.dest = cpu_mask_to_apicid(TARGET_CPUS);
+ entry.delivery_mode = INT_DELIVERY_MODE;
+ entry.polarity = 0;
+ entry.trigger = 0;
+@@ -994,18 +981,17 @@ void __apicdebuginit print_IO_APIC(void)
+
+ printk(KERN_DEBUG ".... IRQ redirection table:\n");
+
+- printk(KERN_DEBUG " NR Log Phy Mask Trig IRR Pol"
+- " Stat Dest Deli Vect: \n");
++ printk(KERN_DEBUG " NR Dst Mask Trig IRR Pol"
++ " Stat Dmod Deli Vect: \n");
+
+ for (i = 0; i <= reg_01.bits.entries; i++) {
+ struct IO_APIC_route_entry entry;
+
+ entry = ioapic_read_entry(apic, i);
+
+- printk(KERN_DEBUG " %02x %03X %02X ",
++ printk(KERN_DEBUG " %02x %03X ",
+ i,
+- entry.dest.logical.logical_dest,
+- entry.dest.physical.physical_dest
++ entry.dest
+ );
+
+ printk("%1d %1d %1d %1d %1d %1d %1d %02X\n",
+@@ -1269,8 +1255,7 @@ void disable_IO_APIC(void)
+ entry.dest_mode = 0; /* Physical */
+ entry.delivery_mode = dest_ExtINT; /* ExtInt */
+ entry.vector = 0;
+- entry.dest.physical.physical_dest =
+- GET_APIC_ID(apic_read(APIC_ID));
++ entry.dest = GET_APIC_ID(apic_read(APIC_ID));
+
+ /*
+ * Add it to the IO-APIC irq-routing table:
+@@ -1355,16 +1340,15 @@ static unsigned int startup_ioapic_irq(u
+
+ static int ioapic_retrigger_irq(unsigned int irq)
+ {
++ struct irq_cfg *cfg = &irq_cfg[irq];
+ cpumask_t mask;
+- unsigned vector;
+ unsigned long flags;
+
+ spin_lock_irqsave(&vector_lock, flags);
+- vector = irq_vector[irq];
+ cpus_clear(mask);
+- cpu_set(first_cpu(irq_domain[irq]), mask);
++ cpu_set(first_cpu(cfg->domain), mask);
+
+- send_IPI_mask(mask, vector);
++ send_IPI_mask(mask, cfg->vector);
+ spin_unlock_irqrestore(&vector_lock, flags);
+
+ return 1;
+@@ -1379,8 +1363,68 @@ static int ioapic_retrigger_irq(unsigned
+ * races.
+ */
+
++#ifdef CONFIG_SMP
++asmlinkage void smp_irq_move_cleanup_interrupt(void)
++{
++ unsigned vector, me;
++ ack_APIC_irq();
++ exit_idle();
++ irq_enter();
++
++ me = smp_processor_id();
++ for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {
++ unsigned int irq;
++ struct irq_desc *desc;
++ struct irq_cfg *cfg;
++ irq = __get_cpu_var(vector_irq)[vector];
++ if (irq >= NR_IRQS)
++ continue;
++
++ desc = irq_desc + irq;
++ cfg = irq_cfg + irq;
++ spin_lock(&desc->lock);
++ if (!cfg->move_cleanup_count)
++ goto unlock;
++
++ if ((vector == cfg->vector) && cpu_isset(me, cfg->domain))
++ goto unlock;
++
++ __get_cpu_var(vector_irq)[vector] = -1;
++ cfg->move_cleanup_count--;
++unlock:
++ spin_unlock(&desc->lock);
++ }
++
++ irq_exit();
++}
++
++static void irq_complete_move(unsigned int irq)
++{
++ struct irq_cfg *cfg = irq_cfg + irq;
++ unsigned vector, me;
++
++ if (likely(!cfg->move_in_progress))
++ return;
++
++ vector = ~get_irq_regs()->orig_rax;
++ me = smp_processor_id();
++ if ((vector == cfg->vector) &&
++ cpu_isset(smp_processor_id(), cfg->domain)) {
++ cpumask_t cleanup_mask;
++
++ cpus_and(cleanup_mask, cfg->old_domain, cpu_online_map);
++ cfg->move_cleanup_count = cpus_weight(cleanup_mask);
++ send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR);
++ cfg->move_in_progress = 0;
++ }
++}
++#else
++static inline void irq_complete_move(unsigned int irq) {}
++#endif
++
+ static void ack_apic_edge(unsigned int irq)
+ {
++ irq_complete_move(irq);
+ move_native_irq(irq);
+ ack_APIC_irq();
+ }
+@@ -1389,6 +1433,7 @@ static void ack_apic_level(unsigned int
+ {
+ int do_unmask_irq = 0;
+
++ irq_complete_move(irq);
+ #if defined(CONFIG_GENERIC_PENDING_IRQ) || defined(CONFIG_IRQBALANCE)
+ /* If we are moving the irq we need to mask it */
+ if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {
+@@ -1440,7 +1485,7 @@ static inline void init_IO_APIC_traps(vo
+ */
+ for (irq = 0; irq < NR_IRQS ; irq++) {
+ int tmp = irq;
+- if (IO_APIC_IRQ(tmp) && !irq_vector[tmp]) {
++ if (IO_APIC_IRQ(tmp) && !irq_cfg[tmp].vector) {
+ /*
+ * Hmm.. We don't have an entry for this,
+ * so default to an old-fashioned 8259
+@@ -1538,7 +1583,7 @@ static inline void unlock_ExtINT_logic(v
+
+ entry1.dest_mode = 0; /* physical delivery */
+ entry1.mask = 0; /* unmask IRQ now */
+- entry1.dest.physical.physical_dest = hard_smp_processor_id();
++ entry1.dest = hard_smp_processor_id();
+ entry1.delivery_mode = dest_ExtINT;
+ entry1.polarity = entry0.polarity;
+ entry1.trigger = 0;
+@@ -1582,15 +1627,14 @@ static inline void unlock_ExtINT_logic(v
+ */
+ static inline void check_timer(void)
+ {
++ struct irq_cfg *cfg = irq_cfg + 0;
+ int apic1, pin1, apic2, pin2;
+- int vector;
+- cpumask_t mask;
+
+ /*
+ * get/set the timer IRQ vector:
+ */
+ disable_8259A_irq(0);
+- vector = assign_irq_vector(0, TARGET_CPUS, &mask);
++ assign_irq_vector(0, TARGET_CPUS);
+
+ /*
+ * Subtle, code in do_timer_interrupt() expects an AEOI
+@@ -1610,7 +1654,7 @@ static inline void check_timer(void)
+ apic2 = ioapic_i8259.apic;
+
+ apic_printk(APIC_VERBOSE,KERN_INFO "..TIMER: vector=0x%02X apic1=%d pin1=%d apic2=%d pin2=%d\n",
+- vector, apic1, pin1, apic2, pin2);
++ cfg->vector, apic1, pin1, apic2, pin2);
+
+ if (pin1 != -1) {
+ /*
+@@ -1641,7 +1685,7 @@ static inline void check_timer(void)
+ /*
+ * legacy devices should be connected to IO APIC #0
+ */
+- setup_ExtINT_IRQ0_pin(apic2, pin2, vector);
++ setup_ExtINT_IRQ0_pin(apic2, pin2, cfg->vector);
+ if (timer_irq_works()) {
+ apic_printk(APIC_VERBOSE," works.\n");
+ nmi_watchdog_default();
+@@ -1666,14 +1710,14 @@ static inline void check_timer(void)
+
+ disable_8259A_irq(0);
+ irq_desc[0].chip = &lapic_irq_type;
+- apic_write(APIC_LVT0, APIC_DM_FIXED | vector); /* Fixed mode */
++ apic_write(APIC_LVT0, APIC_DM_FIXED | cfg->vector); /* Fixed mode */
+ enable_8259A_irq(0);
+
+ if (timer_irq_works()) {
+ apic_printk(APIC_VERBOSE," works.\n");
+ return;
+ }
+- apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | vector);
++ apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector);
+ apic_printk(APIC_VERBOSE," failed.\n");
+
+ apic_printk(APIC_VERBOSE, KERN_INFO "...trying to set up timer as ExtINT IRQ...");
+@@ -1828,19 +1872,16 @@ int create_irq(void)
+ /* Allocate an unused irq */
+ int irq;
+ int new;
+- int vector = 0;
+ unsigned long flags;
+- cpumask_t mask;
+
+ irq = -ENOSPC;
+ spin_lock_irqsave(&vector_lock, flags);
+ for (new = (NR_IRQS - 1); new >= 0; new--) {
+ if (platform_legacy_irq(new))
+ continue;
+- if (irq_vector[new] != 0)
++ if (irq_cfg[new].vector != 0)
+ continue;
+- vector = __assign_irq_vector(new, TARGET_CPUS, &mask);
+- if (likely(vector > 0))
++ if (__assign_irq_vector(new, TARGET_CPUS) == 0)
+ irq = new;
+ break;
+ }
+@@ -1871,12 +1912,15 @@ void destroy_irq(unsigned int irq)
+ #if defined(CONFIG_PCI_MSI) && !defined(CONFIG_XEN)
+ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_msg *msg)
+ {
+- int vector;
++ struct irq_cfg *cfg = irq_cfg + irq;
++ int err;
+ unsigned dest;
+ cpumask_t tmp;
+
+- vector = assign_irq_vector(irq, TARGET_CPUS, &tmp);
+- if (vector >= 0) {
++ tmp = TARGET_CPUS;
++ err = assign_irq_vector(irq, tmp);
++ if (!err) {
++ cpus_and(tmp, cfg->domain, tmp);
+ dest = cpu_mask_to_apicid(tmp);
+
+ msg->address_hi = MSI_ADDR_BASE_HI;
+@@ -1896,40 +1940,38 @@ static int msi_compose_msg(struct pci_de
+ ((INT_DELIVERY_MODE != dest_LowestPrio) ?
+ MSI_DATA_DELIVERY_FIXED:
+ MSI_DATA_DELIVERY_LOWPRI) |
+- MSI_DATA_VECTOR(vector);
++ MSI_DATA_VECTOR(cfg->vector);
+ }
+- return vector;
++ return err;
+ }
+
+ #ifdef CONFIG_SMP
+ static void set_msi_irq_affinity(unsigned int irq, cpumask_t mask)
+ {
++ struct irq_cfg *cfg = irq_cfg + irq;
+ struct msi_msg msg;
+ unsigned int dest;
+ cpumask_t tmp;
+- int vector;
+
+ cpus_and(tmp, mask, cpu_online_map);
+ if (cpus_empty(tmp))
+- tmp = TARGET_CPUS;
-
- static void sync_xen_wallclock(unsigned long dummy);
- static DEFINE_TIMER(sync_xen_wallclock_timer, sync_xen_wallclock, 0, 0);
- static void sync_xen_wallclock(unsigned long dummy)
-@@ -551,15 +399,7 @@ static int set_rtc_mmss(unsigned long no
- return retval;
+- cpus_and(mask, tmp, CPU_MASK_ALL);
++ return;
+
+- vector = assign_irq_vector(irq, mask, &tmp);
+- if (vector < 0)
++ if (assign_irq_vector(irq, mask))
+ return;
+
++ cpus_and(tmp, cfg->domain, mask);
+ dest = cpu_mask_to_apicid(tmp);
+
+ read_msi_msg(irq, &msg);
+
+ msg.data &= ~MSI_DATA_VECTOR_MASK;
+- msg.data |= MSI_DATA_VECTOR(vector);
++ msg.data |= MSI_DATA_VECTOR(cfg->vector);
+ msg.address_lo &= ~MSI_ADDR_DEST_ID_MASK;
+ msg.address_lo |= MSI_ADDR_DEST_ID(dest);
+
+ write_msi_msg(irq, &msg);
+- set_native_irq_info(irq, mask);
++ irq_desc[irq].affinity = mask;
}
+ #endif /* CONFIG_SMP */
--#ifdef CONFIG_X86_64
--/* monotonic_clock(): returns # of nanoseconds passed since time_init()
-- * Note: This function is required to return accurate
-- * time even in the absence of multiple timer ticks.
-- */
--unsigned long long monotonic_clock(void)
--#else
- unsigned long long sched_clock(void)
--#endif
+@@ -1948,24 +1990,31 @@ static struct irq_chip msi_chip = {
+ .retrigger = ioapic_retrigger_irq,
+ };
+
+-int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev)
++int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
{
- unsigned int cpu = get_cpu();
- struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu);
-@@ -579,21 +419,18 @@ unsigned long long sched_clock(void)
+ struct msi_msg msg;
+- int ret;
++ int irq, ret;
++ irq = create_irq();
++ if (irq < 0)
++ return irq;
++
++ set_irq_msi(irq, desc);
+ ret = msi_compose_msg(dev, irq, &msg);
+- if (ret < 0)
++ if (ret < 0) {
++ destroy_irq(irq);
+ return ret;
++ }
- return time;
+ write_msi_msg(irq, &msg);
+
+ set_irq_chip_and_handler_name(irq, &msi_chip, handle_edge_irq, "edge");
+
+- return 0;
++ return irq;
}
--#ifdef CONFIG_X86_64
--EXPORT_SYMBOL(monotonic_clock);
+
+ void arch_teardown_msi_irq(unsigned int irq)
+ {
+- return;
++ destroy_irq(irq);
+ }
+
+ #endif /* CONFIG_PCI_MSI */
+@@ -1993,24 +2042,22 @@ static void target_ht_irq(unsigned int i
+
+ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask)
+ {
++ struct irq_cfg *cfg = irq_cfg + irq;
+ unsigned int dest;
+ cpumask_t tmp;
+- int vector;
+
+ cpus_and(tmp, mask, cpu_online_map);
+ if (cpus_empty(tmp))
+- tmp = TARGET_CPUS;
-
--unsigned long long sched_clock(void)
--{
-- return monotonic_clock();
--}
--#endif
+- cpus_and(mask, tmp, CPU_MASK_ALL);
++ return;
- unsigned long profile_pc(struct pt_regs *regs)
+- vector = assign_irq_vector(irq, mask, &tmp);
+- if (vector < 0)
++ if (assign_irq_vector(irq, mask))
+ return;
+
++ cpus_and(tmp, cfg->domain, mask);
+ dest = cpu_mask_to_apicid(tmp);
+
+- target_ht_irq(irq, dest, vector);
+- set_native_irq_info(irq, mask);
++ target_ht_irq(irq, dest, cfg->vector);
++ irq_desc[irq].affinity = mask;
+ }
+ #endif
+
+@@ -2027,14 +2074,17 @@ static struct irq_chip ht_irq_chip = {
+
+ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)
{
- unsigned long pc = instruction_pointer(regs);
+- int vector;
++ struct irq_cfg *cfg = irq_cfg + irq;
++ int err;
+ cpumask_t tmp;
- #if defined(CONFIG_SMP) || defined(__x86_64__)
-- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
-+# ifdef __i386__
-+ if (!v8086_mode(regs) && SEGMENT_IS_KERNEL_CODE(regs->xcs)
-+# else
-+ if (!user_mode(regs)
-+# endif
-+ && in_lock_functions(pc)) {
- # ifdef CONFIG_FRAME_POINTER
- # ifdef __i386__
- return ((unsigned long *)regs->ebp)[1];
-@@ -602,14 +439,11 @@ unsigned long profile_pc(struct pt_regs
- # endif
- # else
- # ifdef __i386__
-- unsigned long *sp;
-- if ((regs->xcs & 2) == 0)
-- sp = (unsigned long *)®s->esp;
-- else
-- sp = (unsigned long *)regs->esp;
-+ unsigned long *sp = (unsigned long *)®s->esp;
- # else
- unsigned long *sp = (unsigned long *)regs->rsp;
- # endif
-+
- /* Return address is either directly at stack pointer
- or above a saved eflags. Eflags has bits 22-31 zero,
- kernel addresses don't. */
-@@ -762,19 +596,6 @@ irqreturn_t timer_interrupt(int irq, voi
- return IRQ_HANDLED;
+- vector = assign_irq_vector(irq, TARGET_CPUS, &tmp);
+- if (vector >= 0) {
++ tmp = TARGET_CPUS;
++ err = assign_irq_vector(irq, tmp);
++ if (!err) {
+ struct ht_irq_msg msg;
+ unsigned dest;
+
++ cpus_and(tmp, cfg->domain, tmp);
+ dest = cpu_mask_to_apicid(tmp);
+
+ msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest);
+@@ -2042,7 +2092,7 @@ int arch_setup_ht_irq(unsigned int irq,
+ msg.address_lo =
+ HT_IRQ_LOW_BASE |
+ HT_IRQ_LOW_DEST_ID(dest) |
+- HT_IRQ_LOW_VECTOR(vector) |
++ HT_IRQ_LOW_VECTOR(cfg->vector) |
+ ((INT_DEST_MODE == 0) ?
+ HT_IRQ_LOW_DM_PHYSICAL :
+ HT_IRQ_LOW_DM_LOGICAL) |
+@@ -2057,7 +2107,7 @@ int arch_setup_ht_irq(unsigned int irq,
+ set_irq_chip_and_handler_name(irq, &ht_irq_chip,
+ handle_edge_irq, "edge");
+ }
+- return vector;
++ return err;
}
+ #endif /* CONFIG_HT_IRQ */
+
+@@ -2082,13 +2132,8 @@ int __init io_apic_get_redir_entries (in
+ }
+
+
+-int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low)
++int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int polarity)
+ {
+- struct IO_APIC_route_entry entry;
+- unsigned long flags;
+- int vector;
+- cpumask_t mask;
+-
+ if (!IO_APIC_IRQ(irq)) {
+ apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n",
+ ioapic);
+@@ -2101,42 +2146,7 @@ int io_apic_set_pci_routing (int ioapic,
+ if (irq >= 16)
+ add_pin_to_irq(irq, ioapic, pin);
--#ifndef CONFIG_X86_64
-
--void tsc_init(void)
--{
-- init_cpu_khz();
-- printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
-- cpu_khz / 1000, cpu_khz % 1000);
+- vector = assign_irq_vector(irq, TARGET_CPUS, &mask);
+- if (vector < 0)
+- return vector;
-
-- use_tsc_delay();
--}
+- /*
+- * Generate a PCI IRQ routing entry and program the IOAPIC accordingly.
+- * Note that we mask (disable) IRQs now -- these get enabled when the
+- * corresponding device driver registers for this IRQ.
+- */
-
--#include <linux/clocksource.h>
+- memset(&entry,0,sizeof(entry));
-
- void mark_tsc_unstable(void)
- {
- #ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */
-@@ -830,21 +651,9 @@ static struct clocksource clocksource_xe
- .mask = CLOCKSOURCE_MASK(64),
- .mult = 1 << XEN_SHIFT, /* time directly in nanoseconds */
- .shift = XEN_SHIFT,
-- .is_continuous = 1,
-+ .flags = CLOCK_SOURCE_IS_CONTINUOUS,
- };
-
--static int __init init_xen_clocksource(void)
--{
-- clocksource_xen.mult = clocksource_khz2mult(cpu_khz,
-- clocksource_xen.shift);
+- entry.delivery_mode = INT_DELIVERY_MODE;
+- entry.dest_mode = INT_DEST_MODE;
+- entry.dest.logical.logical_dest = cpu_mask_to_apicid(mask);
+- entry.trigger = edge_level;
+- entry.polarity = active_high_low;
+- entry.mask = 1; /* Disabled (masked) */
+- entry.vector = vector & 0xff;
-
-- return clocksource_register(&clocksource_xen);
--}
+- apic_printk(APIC_VERBOSE,KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
+- "IRQ %d Mode:%i Active:%i)\n", ioapic,
+- mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq,
+- edge_level, active_high_low);
-
--module_init(init_xen_clocksource);
+- ioapic_register_intr(irq, entry.vector, edge_level);
-
--#endif
+- if (!ioapic && (irq < 16))
+- disable_8259A_irq(irq);
-
- static void init_missing_ticks_accounting(unsigned int cpu)
- {
- struct vcpu_register_runstate_memory_area area;
-@@ -865,7 +674,7 @@ static void init_missing_ticks_accountin
+- ioapic_write_entry(ioapic, pin, entry);
+-
+- spin_lock_irqsave(&ioapic_lock, flags);
+- set_native_irq_info(irq, TARGET_CPUS);
+- spin_unlock_irqrestore(&ioapic_lock, flags);
++ setup_IO_APIC_irq(ioapic, pin, irq, triggering, polarity);
+
+ return 0;
}
+@@ -2169,8 +2179,10 @@ void __init setup_ioapic_dest(void)
+ * when you have too many devices, because at that time only boot
+ * cpu is online.
+ */
+- if(!irq_vector[irq])
+- setup_IO_APIC_irq(ioapic, pin, irq_entry, irq);
++ if (!irq_cfg[irq].vector)
++ setup_IO_APIC_irq(ioapic, pin, irq,
++ irq_trigger(irq_entry),
++ irq_polarity(irq_entry));
+ else
+ set_ioapic_affinity_irq(irq, TARGET_CPUS);
+ }
+--- sle11-2009-05-14.orig/arch/x86/kernel/irq_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/irq_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -18,6 +18,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/io_apic.h>
+ #include <asm/idle.h>
++#include <asm/smp.h>
- /* not static: needed by APM */
--unsigned long get_cmos_time(void)
-+unsigned long read_persistent_clock(void)
- {
- unsigned long retval;
- unsigned long flags;
-@@ -878,11 +687,11 @@ unsigned long get_cmos_time(void)
+ atomic_t irq_err_count;
- return retval;
- }
--EXPORT_SYMBOL(get_cmos_time);
+@@ -120,9 +121,15 @@ asmlinkage unsigned int do_IRQ(struct pt
- static void sync_cmos_clock(unsigned long dummy);
+ if (likely(irq < NR_IRQS))
+ generic_handle_irq(irq);
+- else if (printk_ratelimit())
+- printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
+- __func__, smp_processor_id(), irq);
++ else {
++#ifndef CONFIG_XEN
++ if (!disable_apic)
++ ack_APIC_irq();
++#endif
++ if (printk_ratelimit())
++ printk(KERN_EMERG "%s: %d.%d No irq handler for irq\n",
++ __func__, smp_processor_id(), irq);
++ }
- static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0);
-+int no_sync_cmos_clock;
+ /*irq_exit();*/
- static void sync_cmos_clock(unsigned long dummy)
- {
-@@ -926,7 +735,8 @@ static void sync_cmos_clock(unsigned lon
+--- sle11-2009-05-14.orig/arch/x86/kernel/mpparse_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/mpparse_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -60,9 +60,9 @@ unsigned long mp_lapic_addr = 0;
+ /* Processor that is doing the boot up */
+ unsigned int boot_cpu_id = -1U;
+ /* Internal processor count */
+-unsigned int num_processors __initdata = 0;
++unsigned int num_processors __cpuinitdata = 0;
- void notify_arch_cmos_timer(void)
+-unsigned disabled_cpus __initdata;
++unsigned disabled_cpus __cpuinitdata;
+
+ /* Bitmask of physically existing CPUs */
+ physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
+@@ -808,7 +808,7 @@ int mp_register_gsi(u32 gsi, int trigger
+ return gsi;
+
+ /* Don't set up the ACPI SCI because it's already set up */
+- if (acpi_fadt.sci_int == gsi)
++ if (acpi_gbl_FADT.sci_interrupt == gsi)
+ return gsi;
+
+ ioapic = mp_find_ioapic(gsi);
+--- sle11-2009-05-14.orig/arch/x86/kernel/process_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/process_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -338,14 +338,17 @@ void load_gs_index(unsigned gs)
+ void flush_thread(void)
{
-- mod_timer(&sync_cmos_timer, jiffies + 1);
-+ if (!no_sync_cmos_clock)
-+ mod_timer(&sync_cmos_timer, jiffies + 1);
- mod_timer(&sync_xen_wallclock_timer, jiffies + 1);
- }
+ struct task_struct *tsk = current;
+- struct thread_info *t = current_thread_info();
-@@ -959,29 +769,11 @@ static int time_init_device(void)
+- if (t->flags & _TIF_ABI_PENDING) {
+- t->flags ^= (_TIF_ABI_PENDING | _TIF_IA32);
+- if (t->flags & _TIF_IA32)
++ if (test_tsk_thread_flag(tsk, TIF_ABI_PENDING)) {
++ clear_tsk_thread_flag(tsk, TIF_ABI_PENDING);
++ if (test_tsk_thread_flag(tsk, TIF_IA32)) {
++ clear_tsk_thread_flag(tsk, TIF_IA32);
++ } else {
++ set_tsk_thread_flag(tsk, TIF_IA32);
+ current_thread_info()->status |= TS_COMPAT;
++ }
+ }
+- t->flags &= ~_TIF_DEBUG;
++ clear_tsk_thread_flag(tsk, TIF_DEBUG);
- device_initcall(time_init_device);
+ tsk->thread.debugreg0 = 0;
+ tsk->thread.debugreg1 = 0;
+--- sle11-2009-05-14.orig/arch/x86/kernel/setup_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/setup_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -141,7 +141,7 @@ EXPORT_SYMBOL_GPL(edid_info);
--#ifdef CONFIG_HPET_TIMER
- extern void (*late_time_init)(void);
--/* Duplicate of time_init() below, with hpet_enable part added */
--static void __init hpet_time_init(void)
+ extern int root_mountflags;
+
+-char command_line[COMMAND_LINE_SIZE];
++char __initdata command_line[COMMAND_LINE_SIZE];
+
+ struct resource standard_io_resources[] = {
+ { .name = "dma1", .start = 0x00, .end = 0x1f,
+@@ -179,134 +179,6 @@ struct resource code_resource = {
+ .flags = IORESOURCE_RAM,
+ };
+
+-#define IORESOURCE_ROM (IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM)
+-
+-static struct resource system_rom_resource = {
+- .name = "System ROM",
+- .start = 0xf0000,
+- .end = 0xfffff,
+- .flags = IORESOURCE_ROM,
+-};
+-
+-static struct resource extension_rom_resource = {
+- .name = "Extension ROM",
+- .start = 0xe0000,
+- .end = 0xeffff,
+- .flags = IORESOURCE_ROM,
+-};
+-
+-static struct resource adapter_rom_resources[] = {
+- { .name = "Adapter ROM", .start = 0xc8000, .end = 0,
+- .flags = IORESOURCE_ROM },
+- { .name = "Adapter ROM", .start = 0, .end = 0,
+- .flags = IORESOURCE_ROM },
+- { .name = "Adapter ROM", .start = 0, .end = 0,
+- .flags = IORESOURCE_ROM },
+- { .name = "Adapter ROM", .start = 0, .end = 0,
+- .flags = IORESOURCE_ROM },
+- { .name = "Adapter ROM", .start = 0, .end = 0,
+- .flags = IORESOURCE_ROM },
+- { .name = "Adapter ROM", .start = 0, .end = 0,
+- .flags = IORESOURCE_ROM }
+-};
+-
+-static struct resource video_rom_resource = {
+- .name = "Video ROM",
+- .start = 0xc0000,
+- .end = 0xc7fff,
+- .flags = IORESOURCE_ROM,
+-};
+-
+-static struct resource video_ram_resource = {
+- .name = "Video RAM area",
+- .start = 0xa0000,
+- .end = 0xbffff,
+- .flags = IORESOURCE_RAM,
+-};
+-
+-#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
+-
+-static int __init romchecksum(unsigned char *rom, unsigned long length)
-{
-- struct timespec ts;
-- ts.tv_sec = get_cmos_time();
-- ts.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
+- unsigned char *p, sum = 0;
+-
+- for (p = rom; p < rom + length; p++)
+- sum += *p;
+- return sum == 0;
+-}
+-
+-static void __init probe_roms(void)
+-{
+- unsigned long start, length, upper;
+- unsigned char *rom;
+- int i;
+-
+-#ifdef CONFIG_XEN
+- /* Nothing to do if not running in dom0. */
+- if (!is_initial_xendomain())
+- return;
+-#endif
+-
+- /* video rom */
+- upper = adapter_rom_resources[0].start;
+- for (start = video_rom_resource.start; start < upper; start += 2048) {
+- rom = isa_bus_to_virt(start);
+- if (!romsignature(rom))
+- continue;
+-
+- video_rom_resource.start = start;
+-
+- /* 0 < length <= 0x7f * 512, historically */
+- length = rom[2] * 512;
-
-- do_settimeofday(&ts);
+- /* if checksum okay, trust length byte */
+- if (length && romchecksum(rom, length))
+- video_rom_resource.end = start + length - 1;
-
-- if ((hpet_enable() >= 0) && hpet_use_timer) {
-- printk("Using HPET for base-timer\n");
+- request_resource(&iomem_resource, &video_rom_resource);
+- break;
+- }
+-
+- start = (video_rom_resource.end + 1 + 2047) & ~2047UL;
+- if (start < upper)
+- start = upper;
+-
+- /* system rom */
+- request_resource(&iomem_resource, &system_rom_resource);
+- upper = system_rom_resource.start;
+-
+- /* check for extension rom (ignore length byte!) */
+- rom = isa_bus_to_virt(extension_rom_resource.start);
+- if (romsignature(rom)) {
+- length = extension_rom_resource.end - extension_rom_resource.start + 1;
+- if (romchecksum(rom, length)) {
+- request_resource(&iomem_resource, &extension_rom_resource);
+- upper = extension_rom_resource.start;
+- }
- }
-
-- do_time_init();
+- /* check for adapter roms on 2k boundaries */
+- for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper;
+- start += 2048) {
+- rom = isa_bus_to_virt(start);
+- if (!romsignature(rom))
+- continue;
+-
+- /* 0 < length <= 0x7f * 512, historically */
+- length = rom[2] * 512;
+-
+- /* but accept any length that fits if checksum okay */
+- if (!length || start + length > upper || !romchecksum(rom, length))
+- continue;
+-
+- adapter_rom_resources[i].start = start;
+- adapter_rom_resources[i].end = start + length - 1;
+- request_resource(&iomem_resource, &adapter_rom_resources[i]);
+-
+- start = adapter_rom_resources[i++].end & ~2047UL;
+- }
-}
--#endif
-
- /* Dynamically-mapped IRQ. */
- DEFINE_PER_CPU(int, timer_irq);
-
--extern void (*late_time_init)(void);
- static void setup_cpu0_timer_irq(void)
- {
- per_cpu(timer_irq, 0) =
-@@ -989,7 +781,7 @@ static void setup_cpu0_timer_irq(void)
- VIRQ_TIMER,
- 0,
- timer_interrupt,
-- SA_INTERRUPT,
-+ IRQF_DISABLED|IRQF_NOBALANCING,
- "timer0",
- NULL);
- BUG_ON(per_cpu(timer_irq, 0) < 0);
-@@ -1001,16 +793,9 @@ static struct vcpu_set_periodic_timer xe
+-
+ #ifdef CONFIG_PROC_VMCORE
+ /* elfcorehdr= specifies the location of elf core header
+ * stored by the crashed kernel. This option will be passed
+@@ -403,7 +275,7 @@ void __init setup_arch(char **cmdline_p)
+ #ifdef CONFIG_XEN
+ extern struct e820map machine_e820;
- void __init time_init(void)
- {
--#ifdef CONFIG_HPET_TIMER
-- if (is_hpet_capable()) {
-- /*
-- * HPET initialization needs to do memory-mapped io. So, let
-- * us do a late initialization after mem_init().
-- */
-- late_time_init = hpet_time_init;
-- return;
-- }
--#endif
-+ init_cpu_khz();
-+ printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
-+ cpu_khz / 1000, cpu_khz % 1000);
+- printk(KERN_INFO "Command line: %s\n", saved_command_line);
++ printk(KERN_INFO "Command line: %s\n", boot_command_line);
- switch (HYPERVISOR_vcpu_op(VCPUOP_set_periodic_timer, 0,
- &xen_set_periodic_tick)) {
-@@ -1029,18 +814,12 @@ void __init time_init(void)
- per_cpu(processed_system_time, 0) = processed_system_time;
- init_missing_ticks_accounting(0);
+ /* Register a call for panic conditions. */
+ atomic_notifier_chain_register(&panic_notifier_list, &xen_panic_block);
+@@ -430,7 +302,7 @@ void __init setup_arch(char **cmdline_p)
-- update_wallclock();
-+ clocksource_register(&clocksource_xen);
+ ARCH_SETUP
+ #else
+- printk(KERN_INFO "Command line: %s\n", saved_command_line);
++ printk(KERN_INFO "Command line: %s\n", boot_command_line);
--#ifdef CONFIG_X86_64
-- init_cpu_khz();
-- printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n",
-- cpu_khz / 1000, cpu_khz % 1000);
-+ update_wallclock();
+ ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+ screen_info = SCREEN_INFO;
+@@ -461,7 +333,7 @@ void __init setup_arch(char **cmdline_p)
-- vxtime.mode = VXTIME_TSC;
-- vxtime.quot = (1000000L << 32) / vxtime_hz;
-- vxtime.tsc_quot = (1000L << 32) / cpu_khz;
-- sync_core();
-- rdtscll(vxtime.last_tsc);
-+#ifndef CONFIG_X86_64
-+ use_tsc_delay();
- #endif
+ early_identify_cpu(&boot_cpu_data);
- /* Cannot request_irq() until kmem is initialised. */
-@@ -1197,7 +976,7 @@ int __cpuinit local_setup_timer(unsigned
- irq = bind_virq_to_irqhandler(VIRQ_TIMER,
- cpu,
- timer_interrupt,
-- SA_INTERRUPT,
-+ IRQF_DISABLED|IRQF_NOBALANCING,
- timer_name[cpu],
- NULL);
- if (irq < 0)
-@@ -1286,7 +1065,7 @@ static ctl_table xen_table[] = {
- };
- static int __init xen_sysctl_init(void)
- {
-- (void)register_sysctl_table(xen_table, 0);
-+ (void)register_sysctl_table(xen_table);
- return 0;
- }
- __initcall(xen_sysctl_init);
---- a/arch/x86/kernel/traps_32-xen.c
-+++ b/arch/x86/kernel/traps_32-xen.c
-@@ -100,6 +100,7 @@ asmlinkage void fixup_4gb_segment(void);
- asmlinkage void machine_check(void);
+- strlcpy(command_line, saved_command_line, COMMAND_LINE_SIZE);
++ strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
+ *cmdline_p = command_line;
- int kstack_depth_to_print = 24;
-+static unsigned int code_bytes = 64;
- ATOMIC_NOTIFIER_HEAD(i386die_chain);
+ parse_early_param();
+@@ -531,6 +403,11 @@ void __init setup_arch(char **cmdline_p)
+ /* reserve ebda region */
+ if (ebda_addr)
+ reserve_bootmem_generic(ebda_addr, ebda_size);
++#ifdef CONFIG_NUMA
++ /* reserve nodemap region */
++ if (nodemap_addr)
++ reserve_bootmem_generic(nodemap_addr, nodemap_size);
++#endif
- int register_die_notifier(struct notifier_block *nb)
-@@ -297,10 +298,11 @@ void show_registers(struct pt_regs *regs
- int i;
- int in_kernel = 1;
- unsigned long esp;
-- unsigned short ss;
-+ unsigned short ss, gs;
+ #ifdef CONFIG_SMP
+ /*
+@@ -731,10 +608,8 @@ void __init setup_arch(char **cmdline_p)
+ #endif
- esp = (unsigned long) (®s->esp);
- savesegment(ss, ss);
-+ savesegment(gs, gs);
- if (user_mode_vm(regs)) {
- in_kernel = 0;
- esp = regs->esp;
-@@ -319,8 +321,8 @@ void show_registers(struct pt_regs *regs
- regs->eax, regs->ebx, regs->ecx, regs->edx);
- printk(KERN_EMERG "esi: %08lx edi: %08lx ebp: %08lx esp: %08lx\n",
- regs->esi, regs->edi, regs->ebp, esp);
-- printk(KERN_EMERG "ds: %04x es: %04x ss: %04x\n",
-- regs->xds & 0xffff, regs->xes & 0xffff, ss);
-+ printk(KERN_EMERG "ds: %04x es: %04x fs: %04x gs: %04x ss: %04x\n",
-+ regs->xds & 0xffff, regs->xes & 0xffff, regs->xfs & 0xffff, gs, ss);
- printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",
- TASK_COMM_LEN, current->comm, current->pid,
- current_thread_info(), current, current->thread_info);
-@@ -330,7 +332,8 @@ void show_registers(struct pt_regs *regs
+ /*
+- * Request address space for all standard RAM and ROM resources
+- * and also for regions reported as reserved by the e820.
++ * We trust e820 completely. No explicit ROM probing in memory.
*/
- if (in_kernel) {
- u8 *eip;
-- int code_bytes = 64;
-+ unsigned int code_prologue = code_bytes * 43 / 64;
-+ unsigned int code_len = code_bytes;
- unsigned char c;
+- probe_roms();
+ #ifdef CONFIG_XEN
+ if (is_initial_xendomain())
+ e820_reserve_resources(machine_e820.map, machine_e820.nr_map);
+@@ -743,8 +618,6 @@ void __init setup_arch(char **cmdline_p)
+ e820_mark_nosave_regions();
+ #endif
- printk("\n" KERN_EMERG "Stack: ");
-@@ -338,14 +341,14 @@ void show_registers(struct pt_regs *regs
+- request_resource(&iomem_resource, &video_ram_resource);
+-
+ {
+ unsigned i;
+ /* request I/O space for devices used on all i[345]86 PCs */
+@@ -1321,7 +1194,8 @@ static int show_cpuinfo(struct seq_file
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
+- NULL, "fxsr_opt", NULL, "rdtscp", NULL, "lm", "3dnowext", "3dnow",
++ NULL, "fxsr_opt", "pdpe1gb", "rdtscp", NULL, "lm",
++ "3dnowext", "3dnow",
- printk(KERN_EMERG "Code: ");
+ /* Transmeta-defined */
+ "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
+@@ -1339,7 +1213,7 @@ static int show_cpuinfo(struct seq_file
+ /* Intel-defined (#2) */
+ "pni", NULL, NULL, "monitor", "ds_cpl", "vmx", "smx", "est",
+ "tm2", "ssse3", "cid", NULL, NULL, "cx16", "xtpr", NULL,
+- NULL, NULL, "dca", NULL, NULL, NULL, NULL, NULL,
++ NULL, NULL, "dca", NULL, NULL, NULL, NULL, "popcnt",
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-- eip = (u8 *)regs->eip - 43;
-+ eip = (u8 *)regs->eip - code_prologue;
- if (eip < (u8 *)PAGE_OFFSET ||
- probe_kernel_address(eip, c)) {
- /* try starting at EIP */
- eip = (u8 *)regs->eip;
-- code_bytes = 32;
-+ code_len = code_len - code_prologue + 1;
- }
-- for (i = 0; i < code_bytes; i++, eip++) {
-+ for (i = 0; i < code_len; i++, eip++) {
- if (eip < (u8 *)PAGE_OFFSET ||
- probe_kernel_address(eip, c)) {
- printk(" Bad EIP value.");
-@@ -1134,3 +1137,13 @@ static int __init kstack_setup(char *s)
- return 1;
- }
- __setup("kstack=", kstack_setup);
-+
-+static int __init code_bytes_setup(char *s)
-+{
-+ code_bytes = simple_strtoul(s, NULL, 0);
-+ if (code_bytes > 8192)
-+ code_bytes = 8192;
-+
-+ return 1;
-+}
-+__setup("code_bytes=", code_bytes_setup);
---- a/arch/x86/kernel/vsyscall_64-xen.c
-+++ b/arch/x86/kernel/vsyscall_64-xen.c
+ /* VIA/Cyrix/Centaur-defined */
+@@ -1349,8 +1223,10 @@ static int show_cpuinfo(struct seq_file
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+
+ /* AMD-defined (#2) */
+- "lahf_lm", "cmp_legacy", "svm", NULL, "cr8_legacy", NULL, NULL, NULL,
+- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
++ "lahf_lm", "cmp_legacy", "svm", "extapic", "cr8_legacy",
++ "altmovcr8", "abm", "sse4a",
++ "misalignsse", "3dnowprefetch",
++ "osvw", "ibs", NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ };
+@@ -1361,6 +1237,9 @@ static int show_cpuinfo(struct seq_file
+ "ttp", /* thermal trip */
+ "tm",
+ "stc",
++ "100mhzsteps",
++ "hwpstate",
++ NULL, /* tsc invariant mapped to constant_tsc */
+ NULL,
+ /* nothing */ /* constant_tsc - moved to flags */
+ };
+@@ -1477,26 +1356,3 @@ struct seq_operations cpuinfo_op = {
+ .stop = c_stop,
+ .show = show_cpuinfo,
+ };
+-
+-#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
+-#include <linux/platform_device.h>
+-static __init int add_pcspkr(void)
+-{
+- struct platform_device *pd;
+- int ret;
+-
+- if (!is_initial_xendomain())
+- return 0;
+-
+- pd = platform_device_alloc("pcspkr", -1);
+- if (!pd)
+- return -ENOMEM;
+-
+- ret = platform_device_add(pd);
+- if (ret)
+- platform_device_put(pd);
+-
+- return ret;
+-}
+-device_initcall(add_pcspkr);
+-#endif
+--- sle11-2009-05-14.orig/arch/x86/kernel/vsyscall_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/kernel/vsyscall_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -26,6 +26,7 @@
#include <linux/seqlock.h>
#include <linux/jiffies.h>
#endif
on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
hotcpu_notifier(cpu_vsyscall_notifier, 0);
---- a/arch/x86/mm/fault_32-xen.c
-+++ b/arch/x86/mm/fault_32-xen.c
-@@ -46,43 +46,17 @@ int unregister_page_fault_notifier(struc
- }
- EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
-
--static inline int notify_page_fault(enum die_val val, const char *str,
-- struct pt_regs *regs, long err, int trap, int sig)
-+static inline int notify_page_fault(struct pt_regs *regs, long err)
- {
- struct die_args args = {
- .regs = regs,
-- .str = str,
-+ .str = "page fault",
- .err = err,
-- .trapnr = trap,
-- .signr = sig
-+ .trapnr = 14,
-+ .signr = SIGSEGV
- };
-- return atomic_notifier_call_chain(¬ify_page_fault_chain, val, &args);
--}
--
--/*
-- * Unlock any spinlocks which will prevent us from getting the
-- * message out
-- */
--void bust_spinlocks(int yes)
--{
-- int loglevel_save = console_loglevel;
--
-- if (yes) {
-- oops_in_progress = 1;
-- return;
-- }
--#ifdef CONFIG_VT
-- unblank_screen();
--#endif
-- oops_in_progress = 0;
-- /*
-- * OK, the message is on the console. Now we call printk()
-- * without oops_in_progress set so that printk will give klogd
-- * a poke. Hold onto your hats...
-- */
-- console_loglevel = 15; /* NMI oopser may have shut the console up */
-- printk(" ");
-- console_loglevel = loglevel_save;
-+ return atomic_notifier_call_chain(¬ify_page_fault_chain,
-+ DIE_PAGE_FAULT, &args);
- }
-
- /*
-@@ -476,8 +450,7 @@ fastcall void __kprobes do_page_fault(st
- /* Can take a spurious fault if mapping changes R/O -> R/W. */
- if (spurious_fault(regs, address, error_code))
- return;
-- if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
-- SIGSEGV) == NOTIFY_STOP)
-+ if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
- return;
- /*
- * Don't take the mm semaphore here. If we fixup a prefetch
-@@ -486,8 +459,7 @@ fastcall void __kprobes do_page_fault(st
- goto bad_area_nosemaphore;
- }
-
-- if (notify_page_fault(DIE_PAGE_FAULT, "page fault", regs, error_code, 14,
-- SIGSEGV) == NOTIFY_STOP)
-+ if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
- return;
-
- /* It's safe to allow irq's after cr2 has been saved and the vmalloc
---- a/arch/x86/mm/fault_64-xen.c
-+++ b/arch/x86/mm/fault_64-xen.c
+--- sle11-2009-05-14.orig/arch/x86/mm/fault_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/fault_64-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -56,38 +56,17 @@ int unregister_page_fault_notifier(struc
}
EXPORT_SYMBOL_GPL(unregister_page_fault_notifier);
return;
if (likely(regs->eflags & X86_EFLAGS_IF))
---- a/arch/x86/mm/highmem_32-xen.c
-+++ b/arch/x86/mm/highmem_32-xen.c
-@@ -33,14 +33,16 @@ static void *__kmap_atomic(struct page *
-
- /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
- pagefault_disable();
-+
-+ idx = type + KM_TYPE_NR*smp_processor_id();
-+ BUG_ON(!pte_none(*(kmap_pte-idx)));
-+
- if (!PageHighMem(page))
- return page_address(page);
-
-- idx = type + KM_TYPE_NR*smp_processor_id();
- vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-- if (!pte_none(*(kmap_pte-idx)))
-- BUG();
- set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));
-+ /*arch_flush_lazy_mmu_mode();*/
-
- return (void*) vaddr;
- }
-@@ -94,6 +96,7 @@ void *kmap_atomic_pfn(unsigned long pfn,
- idx = type + KM_TYPE_NR*smp_processor_id();
- vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
- set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot));
-+ /*arch_flush_lazy_mmu_mode();*/
-
- return (void*) vaddr;
- }
---- a/arch/x86/mm/init_32-xen.c
-+++ b/arch/x86/mm/init_32-xen.c
-@@ -66,6 +66,7 @@ static pmd_t * __init one_md_table_init(
-
- #ifdef CONFIG_X86_PAE
- pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
-+ paravirt_alloc_pd(__pa(pmd_table) >> PAGE_SHIFT);
- make_lowmem_page_readonly(pmd_table, XENFEAT_writable_page_tables);
- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
- pud = pud_offset(pgd, 0);
-@@ -87,6 +88,7 @@ static pte_t * __init one_page_table_ini
- {
- if (pmd_none(*pmd)) {
- pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
-+ paravirt_alloc_pt(__pa(page_table) >> PAGE_SHIFT);
- make_lowmem_page_readonly(page_table,
- XENFEAT_writable_page_tables);
- set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
---- a/arch/x86/mm/init_64-xen.c
-+++ b/arch/x86/mm/init_64-xen.c
-@@ -1110,20 +1110,30 @@ int kern_addr_valid(unsigned long addr)
+--- sle11-2009-05-14.orig/arch/x86/mm/init_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/init_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -1108,20 +1108,30 @@ int kern_addr_valid(unsigned long addr)
extern int exception_trace, page_fault_trace;
static ctl_table debug_table2[] = {
+ .proc_handler = proc_dointvec
+ },
+ {}
- };
-
- static ctl_table debug_root_table2[] = {
-- { .ctl_name = CTL_DEBUG, .procname = "debug", .mode = 0555,
-- .child = debug_table2 },
-- { 0 },
-+ {
-+ .ctl_name = CTL_DEBUG,
-+ .procname = "debug",
-+ .mode = 0555,
-+ .child = debug_table2
-+ },
-+ {}
- };
-
- static __init int x8664_sysctl_init(void)
- {
-- register_sysctl_table(debug_root_table2, 1);
-+ register_sysctl_table(debug_root_table2);
- return 0;
- }
- __initcall(x8664_sysctl_init);
---- a/arch/x86/mm/pageattr_64-xen.c
-+++ b/arch/x86/mm/pageattr_64-xen.c
-@@ -350,8 +350,8 @@ static void flush_kernel_map(void *arg)
- void *adr = page_address(pg);
- if (cpu_has_clflush)
- cache_flush_page(adr);
-- __flush_tlb_one(adr);
- }
-+ __flush_tlb_all();
- }
-
- static inline void flush_map(struct list_head *l)
-@@ -376,6 +376,7 @@ static void revert_page(unsigned long ad
- pud_t *pud;
- pmd_t *pmd;
- pte_t large_pte;
-+ unsigned long pfn;
-
- pgd = pgd_offset_k(address);
- BUG_ON(pgd_none(*pgd));
-@@ -383,7 +384,8 @@ static void revert_page(unsigned long ad
- BUG_ON(pud_none(*pud));
- pmd = pmd_offset(pud, address);
- BUG_ON(__pmd_val(*pmd) & _PAGE_PSE);
-- large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
-+ pfn = (__pa(address) & LARGE_PAGE_MASK) >> PAGE_SHIFT;
-+ large_pte = pfn_pte(pfn, ref_prot);
- large_pte = pte_mkhuge(large_pte);
- set_pte((pte_t *)pmd, large_pte);
- }
---- a/arch/x86/mm/pgtable_32-xen.c
-+++ b/arch/x86/mm/pgtable_32-xen.c
-@@ -149,6 +149,8 @@ void __set_fixmap (enum fixed_addresses
- void __init reserve_top_address(unsigned long reserve)
- {
- BUG_ON(fixmaps > 0);
-+ printk(KERN_INFO "Reserving virtual address space above 0x%08x\n",
-+ (int)-reserve);
- __FIXADDR_TOP = -reserve - PAGE_SIZE;
- __VMALLOC_RESERVE += reserve;
- }
-@@ -258,6 +260,12 @@ void pgd_ctor(void *pgd, struct kmem_cac
- swapper_pg_dir + USER_PTRS_PER_PGD,
- KERNEL_PGD_PTRS);
- memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
-+
-+ /* must happen under lock */
-+ paravirt_alloc_pd_clone(__pa(pgd) >> PAGE_SHIFT,
-+ __pa(swapper_pg_dir) >> PAGE_SHIFT,
-+ USER_PTRS_PER_PGD, PTRS_PER_PGD - USER_PTRS_PER_PGD);
-+
- pgd_list_add(pgd);
- spin_unlock_irqrestore(&pgd_lock, flags);
- }
-@@ -268,6 +276,7 @@ void pgd_dtor(void *pgd, struct kmem_cac
- {
- unsigned long flags; /* can be called from interrupt context */
-
-+ paravirt_release_pd(__pa(pgd) >> PAGE_SHIFT);
- spin_lock_irqsave(&pgd_lock, flags);
- pgd_list_del(pgd);
- spin_unlock_irqrestore(&pgd_lock, flags);
-@@ -292,6 +301,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
- pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
- if (!pmd)
- goto out_oom;
-+ paravirt_alloc_pd(__pa(pmd) >> PAGE_SHIFT);
- set_pgd(&pgd[i], __pgd(1 + __pa(pmd)));
- }
- return pgd;
-@@ -314,6 +324,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
- pmd[i] = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
- if (!pmd[i])
- goto out_oom;
-+ paravirt_alloc_pd(__pa(pmd) >> PAGE_SHIFT);
- }
+ };
- spin_lock_irqsave(&pgd_lock, flags);
-@@ -354,12 +365,17 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ static ctl_table debug_root_table2[] = {
+- { .ctl_name = CTL_DEBUG, .procname = "debug", .mode = 0555,
+- .child = debug_table2 },
+- { 0 },
++ {
++ .ctl_name = CTL_DEBUG,
++ .procname = "debug",
++ .mode = 0555,
++ .child = debug_table2
++ },
++ {}
+ };
- out_oom:
- if (HAVE_SHARED_KERNEL_PMD) {
-- for (i--; i >= 0; i--)
-- kmem_cache_free(pmd_cache,
-- (void *)__va(pgd_val(pgd[i])-1));
-+ for (i--; i >= 0; i--) {
-+ pgd_t pgdent = pgd[i];
-+ void* pmd = (void *)__va(pgd_val(pgdent)-1);
-+ paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
-+ kmem_cache_free(pmd_cache, pmd);
-+ }
- } else {
-- for (i--; i >= 0; i--)
-+ for (i--; i >= 0; i--) {
-+ paravirt_release_pd(__pa(pmd[i]) >> PAGE_SHIFT);
- kmem_cache_free(pmd_cache, pmd[i]);
-+ }
- kfree(pmd);
+ static __init int x8664_sysctl_init(void)
+ {
+- register_sysctl_table(debug_root_table2, 1);
++ register_sysctl_table(debug_root_table2);
+ return 0;
+ }
+ __initcall(x8664_sysctl_init);
+--- sle11-2009-05-14.orig/arch/x86/mm/pageattr_64-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/arch/x86/mm/pageattr_64-xen.c 2009-03-04 11:25:55.000000000 +0100
+@@ -350,8 +350,8 @@ static void flush_kernel_map(void *arg)
+ void *adr = page_address(pg);
+ if (cpu_has_clflush)
+ cache_flush_page(adr);
+- __flush_tlb_one(adr);
}
- kmem_cache_free(pgd_cache, pgd);
-@@ -383,7 +399,9 @@ void pgd_free(pgd_t *pgd)
- /* in the PAE case user pgd entries are overwritten before usage */
- if (PTRS_PER_PMD > 1) {
- for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
-- pmd_t *pmd = (void *)__va(pgd_val(pgd[i])-1);
-+ pgd_t pgdent = pgd[i];
-+ void* pmd = (void *)__va(pgd_val(pgdent)-1);
-+ paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);
- kmem_cache_free(pmd_cache, pmd);
- }
++ __flush_tlb_all();
+ }
+
+ static inline void flush_map(struct list_head *l)
+@@ -376,6 +376,7 @@ static void revert_page(unsigned long ad
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t large_pte;
++ unsigned long pfn;
---- a/drivers/acpi/processor_extcntl.c
-+++ b/drivers/acpi/processor_extcntl.c
+ pgd = pgd_offset_k(address);
+ BUG_ON(pgd_none(*pgd));
+@@ -383,7 +384,8 @@ static void revert_page(unsigned long ad
+ BUG_ON(pud_none(*pud));
+ pmd = pmd_offset(pud, address);
+ BUG_ON(__pmd_val(*pmd) & _PAGE_PSE);
+- large_pte = mk_pte_phys(__pa(address) & LARGE_PAGE_MASK, ref_prot);
++ pfn = (__pa(address) & LARGE_PAGE_MASK) >> PAGE_SHIFT;
++ large_pte = pfn_pte(pfn, ref_prot);
+ large_pte = pte_mkhuge(large_pte);
+ set_pte((pte_t *)pmd, large_pte);
+ }
+--- sle11-2009-05-14.orig/drivers/acpi/processor_extcntl.c 2009-02-16 15:58:14.000000000 +0100
++++ sle11-2009-05-14/drivers/acpi/processor_extcntl.c 2009-03-04 11:25:55.000000000 +0100
@@ -32,9 +32,8 @@
#define ACPI_PROCESSOR_COMPONENT 0x01000000
- (u32) acpi_fadt.pstate_cnt, 8);
+ status = acpi_os_write_port(acpi_gbl_FADT.smi_command,
+ acpi_gbl_FADT.pstate_control, 8);
- if (ACPI_FAILURE(status))
+ if (ACPI_FAILURE(status))
return status;
---- a/drivers/char/tpm/tpm_xen.c
-+++ b/drivers/char/tpm/tpm_xen.c
+--- sle11-2009-05-14.orig/drivers/char/tpm/tpm_xen.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/char/tpm/tpm_xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -481,7 +481,6 @@ static struct xenbus_device_id tpmfront_
static struct xenbus_driver tpmfront = {
}
static int tpmif_allocate_tx_buffers(struct tpm_private *tp)
---- a/drivers/pci/msi-xen.c
-+++ b/drivers/pci/msi-xen.c
+--- sle11-2009-05-14.orig/drivers/pci/msi-xen.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/pci/msi-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -44,6 +44,36 @@ struct msi_pirq_entry {
int entry_nr;
};
static struct msi_dev_list *get_msi_dev_pirq_list(struct pci_dev *dev)
{
struct msi_dev_list *msi_dev_list, *ret = NULL;
-@@ -235,85 +265,13 @@ static int msi_map_vector(struct pci_dev
+@@ -235,126 +265,26 @@ static int msi_map_vector(struct pci_dev
static int msi_init(void)
{
- }
-
- pci_intx(dev, 0); /* disable intx */
--}
--
--#ifdef CONFIG_PM
++ return 0;
+ }
+
+ #ifdef CONFIG_PM
-int pci_save_msi_state(struct pci_dev *dev)
--{
++static void __pci_restore_msi_state(struct pci_dev *dev)
+ {
- int pos;
-
- pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
- if (pos <= 0 || dev->no_msi)
- return 0;
--
-- if (!dev->msi_enabled)
++ int pirq;
+
+ if (!dev->msi_enabled)
- return 0;
-
- /* Restore dev->irq to its default pin-assertion vector */
- disable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
- /* Set the flags for use of restore */
- dev->msi_enabled = 1;
- return 0;
- }
-
+- return 0;
+-}
+-
-void pci_restore_msi_state(struct pci_dev *dev)
-+#ifdef CONFIG_PM
-+static void __pci_restore_msi_state(struct pci_dev *dev)
- {
+-{
- int pos, pirq;
-
- pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
- if (pos <= 0)
+ return;
+
+- if (!dev->msi_enabled)
- return;
-+ int pirq;
++ pci_intx(dev, 0); /* disable intx */
++ msi_set_enable(dev, 0);
- if (!dev->msi_enabled)
- return;
-@@ -321,40 +279,12 @@ void pci_restore_msi_state(struct pci_de
pirq = msi_map_pirq_to_vector(dev, dev->irq, 0, 0);
if (pirq < 0)
return;
- enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
--}
--
+ }
+
-int pci_save_msix_state(struct pci_dev *dev)
-{
- int pos;
- unsigned long flags;
- struct msi_dev_list *msi_dev_entry;
- struct msi_pirq_entry *pirq_entry, *tmp;
-
+-
- pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
- if (pos <= 0 || dev->no_msi)
- return 0;
- dev->msix_enabled = 1;
-
- return 0;
-+ pci_intx(dev, 0); /* disable intx */
-+ msi_set_enable(dev, 0);
- }
-
+-}
+-
-void pci_restore_msix_state(struct pci_dev *dev)
+static void __pci_restore_msix_state(struct pci_dev *dev)
{
int pos;
unsigned long flags;
-@@ -387,9 +317,16 @@ void pci_restore_msix_state(struct pci_d
- }
- spin_unlock_irqrestore(&msi_dev_entry->pirq_list_lock, flags);
+@@ -369,6 +299,9 @@ void pci_restore_msix_state(struct pci_d
+ if (!dev->msix_enabled)
+ return;
-- enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
+ pci_intx(dev, 0); /* disable intx */
+ msix_set_enable(dev, 0);
- }
--#endif
+
+ msi_dev_entry = get_msi_dev_pirq_list(dev);
+ table_base = find_table_base(dev, pos);
+ if (!table_base)
+@@ -386,10 +319,14 @@ void pci_restore_msix_state(struct pci_d
+ pirq_entry->pirq, rc);
+ }
+ spin_unlock_irqrestore(&msi_dev_entry->pirq_list_lock, flags);
++}
+
+- enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
+void pci_restore_msi_state(struct pci_dev *dev)
+{
+ __pci_restore_msi_state(dev);
+ __pci_restore_msix_state(dev);
-+}
+ }
+-#endif
+#endif /* CONFIG_PM */
/**
dev->msix_enabled = 1;
return 0;
-@@ -572,17 +515,14 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -567,17 +510,14 @@ int pci_enable_msi(struct pci_dev* dev)
/* Check whether driver already requested for MSI-X irqs */
if (dev->msix_enabled) {
printk(KERN_INFO "PCI: %s: Can't enable MSI. "
return status;
}
-@@ -590,7 +530,6 @@ int pci_enable_msi(struct pci_dev* dev)
+@@ -585,7 +525,6 @@ int pci_enable_msi(struct pci_dev* dev)
extern void pci_frontend_disable_msi(struct pci_dev* dev);
void pci_disable_msi(struct pci_dev* dev)
{
int pirq;
if (!pci_msi_enable)
-@@ -607,8 +546,7 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -602,8 +541,7 @@ void pci_disable_msi(struct pci_dev* dev
}
#endif
return;
pirq = dev->irq;
-@@ -617,7 +555,9 @@ void pci_disable_msi(struct pci_dev* dev
+@@ -612,7 +550,9 @@ void pci_disable_msi(struct pci_dev* dev
msi_unmap_pirq(dev, pirq);
/* Disable MSI mode */
}
/**
-@@ -710,7 +650,6 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -705,7 +645,6 @@ int pci_enable_msix(struct pci_dev* dev,
printk(KERN_INFO "PCI: %s: Can't enable MSI-X. "
"Device already has an MSI irq assigned\n",
pci_name(dev));
return -EINVAL;
}
-@@ -718,8 +657,6 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -713,8 +652,6 @@ int pci_enable_msix(struct pci_dev* dev,
if ( !status )
dev->irq_old = temp;
return status;
}
-@@ -727,10 +664,6 @@ int pci_enable_msix(struct pci_dev* dev,
+@@ -722,10 +659,6 @@ int pci_enable_msix(struct pci_dev* dev,
extern void pci_frontend_disable_msix(struct pci_dev* dev);
void pci_disable_msix(struct pci_dev* dev)
{
if (!pci_msi_enable)
return;
if (!dev)
-@@ -756,18 +689,15 @@ void pci_disable_msix(struct pci_dev* de
+@@ -751,18 +684,15 @@ void pci_disable_msix(struct pci_dev* de
}
#endif
}
/**
---- a/drivers/xen/balloon/sysfs.c
-+++ b/drivers/xen/balloon/sysfs.c
+--- sle11-2009-05-14.orig/drivers/xen/balloon/sysfs.c 2008-11-25 13:31:07.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/balloon/sysfs.c 2009-03-04 11:25:55.000000000 +0100
@@ -34,6 +34,7 @@
#include <linux/stat.h>
#include <linux/string.h>
#include "common.h"
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
---- a/drivers/xen/blkback/xenbus.c
-+++ b/drivers/xen/blkback/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/blkback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blkback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -527,7 +527,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blkback = {
+ if (xenbus_register_backend(&blkback))
+ BUG();
}
---- a/drivers/xen/blkfront/blkfront.c
-+++ b/drivers/xen/blkfront/blkfront.c
-@@ -907,7 +907,6 @@ MODULE_ALIAS("xen:vbd");
+--- sle11-2009-05-14.orig/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:27.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/blkfront/blkfront.c 2009-03-24 10:08:49.000000000 +0100
+@@ -902,7 +902,6 @@ MODULE_ALIAS("xen:vbd");
static struct xenbus_driver blkfront = {
.name = "vbd",
.ids = blkfront_ids,
.probe = blkfront_probe,
.remove = blkfront_remove,
---- a/drivers/xen/blktap/xenbus.c
-+++ b/drivers/xen/blktap/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/blktap/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/blktap/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -465,7 +465,6 @@ static const struct xenbus_device_id blk
static struct xenbus_driver blktap = {
+ if (xenbus_register_backend(&blktap))
+ BUG();
}
---- a/drivers/xen/core/evtchn.c
-+++ b/drivers/xen/core/evtchn.c
-@@ -144,7 +144,7 @@ static void bind_evtchn_to_cpu(unsigned
+--- sle11-2009-05-14.orig/drivers/xen/core/evtchn.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/evtchn.c 2009-03-04 11:25:55.000000000 +0100
+@@ -145,7 +145,7 @@ static void bind_evtchn_to_cpu(unsigned
BUG_ON(!test_bit(chn, s->evtchn_mask));
if (irq != -1)
clear_bit(chn, (unsigned long *)cpu_evtchn_mask[cpu_evtchn[chn]]);
set_bit(chn, (unsigned long *)cpu_evtchn_mask[cpu]);
-@@ -157,7 +157,7 @@ static void init_evtchn_cpu_bindings(voi
+@@ -158,7 +158,7 @@ static void init_evtchn_cpu_bindings(voi
/* By default all event channels notify CPU#0. */
for (i = 0; i < NR_IRQS; i++)
memset(cpu_evtchn, 0, sizeof(cpu_evtchn));
memset(cpu_evtchn_mask[0], ~0, sizeof(cpu_evtchn_mask[0]));
---- a/drivers/xen/core/smpboot.c
-+++ b/drivers/xen/core/smpboot.c
-@@ -121,7 +121,7 @@ static int __cpuinit xen_smp_intr_init(u
+@@ -736,6 +736,7 @@ static struct irq_chip dynirq_chip = {
+ .name = "Dynamic",
+ .startup = startup_dynirq,
+ .shutdown = mask_dynirq,
++ .disable = mask_dynirq,
+ .mask = mask_dynirq,
+ .unmask = unmask_dynirq,
+ .mask_ack = ack_dynirq,
+--- sle11-2009-05-14.orig/drivers/xen/core/smpboot.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/core/smpboot.c 2009-03-04 11:25:55.000000000 +0100
+@@ -117,7 +117,7 @@ static int __cpuinit xen_smp_intr_init(u
rc = bind_ipi_to_irqhandler(RESCHEDULE_VECTOR,
cpu,
smp_reschedule_interrupt,
resched_name[cpu],
NULL);
if (rc < 0)
-@@ -132,7 +132,7 @@ static int __cpuinit xen_smp_intr_init(u
+@@ -128,7 +128,7 @@ static int __cpuinit xen_smp_intr_init(u
rc = bind_ipi_to_irqhandler(CALL_FUNCTION_VECTOR,
cpu,
smp_call_function_interrupt,
callfunc_name[cpu],
NULL);
if (rc < 0)
-@@ -261,7 +261,7 @@ void __init smp_prepare_cpus(unsigned in
+@@ -257,7 +257,7 @@ void __init smp_prepare_cpus(unsigned in
{
unsigned int cpu;
struct task_struct *idle;
struct vcpu_get_physid cpu_id;
#ifdef __x86_64__
struct desc_ptr *gdt_descr;
-@@ -270,14 +270,8 @@ void __init smp_prepare_cpus(unsigned in
+@@ -266,14 +266,8 @@ void __init smp_prepare_cpus(unsigned in
#endif
apicid = 0;
boot_cpu_data.apicid = apicid;
cpu_data[0] = boot_cpu_data;
-@@ -333,14 +327,8 @@ void __init smp_prepare_cpus(unsigned in
+@@ -329,14 +323,8 @@ void __init smp_prepare_cpus(unsigned in
XENFEAT_writable_descriptor_tables);
apicid = cpu;
cpu_data[cpu] = boot_cpu_data;
cpu_data[cpu].apicid = apicid;
---- a/drivers/xen/fbfront/xenfb.c
-+++ b/drivers/xen/fbfront/xenfb.c
-@@ -856,7 +856,6 @@ MODULE_ALIAS("xen:vfb");
+--- sle11-2009-05-14.orig/drivers/xen/fbfront/xenfb.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/fbfront/xenfb.c 2009-03-04 11:25:55.000000000 +0100
+@@ -857,7 +857,6 @@ MODULE_ALIAS("xen:vfb");
static struct xenbus_driver xenfb_driver = {
.name = "vfb",
.ids = xenfb_ids,
.probe = xenfb_probe,
.remove = xenfb_remove,
---- a/drivers/xen/fbfront/xenkbd.c
-+++ b/drivers/xen/fbfront/xenkbd.c
+--- sle11-2009-05-14.orig/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/fbfront/xenkbd.c 2009-03-04 11:25:55.000000000 +0100
@@ -323,7 +323,6 @@ MODULE_ALIAS("xen:vkbd");
static struct xenbus_driver xenkbd_driver = {
.ids = xenkbd_ids,
.probe = xenkbd_probe,
.remove = xenkbd_remove,
---- a/drivers/xen/netback/xenbus.c
-+++ b/drivers/xen/netback/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/netback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/netback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -439,7 +439,6 @@ static const struct xenbus_device_id net
static struct xenbus_driver netback = {
+ if (xenbus_register_backend(&netback))
+ BUG();
}
---- a/drivers/xen/netfront/netfront.c
-+++ b/drivers/xen/netfront/netfront.c
+--- sle11-2009-05-14.orig/drivers/xen/netfront/netfront.c 2009-03-30 16:34:59.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/netfront/netfront.c 2009-03-30 16:35:44.000000000 +0200
@@ -1892,20 +1892,19 @@ static struct ethtool_ops network_ethtoo
};
.ids = netfront_ids,
.probe = netfront_probe,
.remove = __devexit_p(netfront_remove),
---- a/drivers/xen/pciback/xenbus.c
-+++ b/drivers/xen/pciback/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/pciback/xenbus.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/pciback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -682,7 +682,6 @@ static const struct xenbus_device_id xen
static struct xenbus_driver xenbus_pciback_driver = {
.ids = xenpci_ids,
.probe = pciback_xenbus_probe,
.remove = pciback_xenbus_remove,
---- a/drivers/xen/pcifront/xenbus.c
-+++ b/drivers/xen/pcifront/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/pcifront/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/pcifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -436,7 +436,6 @@ MODULE_ALIAS("xen:pci");
static struct xenbus_driver xenbus_pcifront_driver = {
.ids = xenpci_ids,
.probe = pcifront_xenbus_probe,
.remove = pcifront_xenbus_remove,
---- a/drivers/xen/scsiback/xenbus.c
-+++ b/drivers/xen/scsiback/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/scsiback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/scsiback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -350,7 +350,6 @@ static struct xenbus_device_id scsiback_
static struct xenbus_driver scsiback = {
.ids = scsiback_ids,
.probe = scsiback_probe,
.remove = scsiback_remove,
---- a/drivers/xen/scsifront/xenbus.c
-+++ b/drivers/xen/scsifront/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/scsifront/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/scsifront/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -401,7 +401,6 @@ static struct xenbus_device_id scsifront
static struct xenbus_driver scsifront_driver = {
.ids = scsifront_ids,
.probe = scsifront_probe,
.remove = scsifront_remove,
---- a/drivers/xen/tpmback/common.h
-+++ b/drivers/xen/tpmback/common.h
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/common.h 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/tpmback/common.h 2009-03-04 11:25:55.000000000 +0100
@@ -54,11 +54,11 @@ typedef struct tpmif_st {
void tpmif_disconnect_complete(tpmif_t * tpmif);
void tpmif_xenbus_exit(void);
int tpmif_map(tpmif_t *tpmif, unsigned long shared_page, unsigned int evtchn);
irqreturn_t tpmif_be_int(int irq, void *dev_id);
---- a/drivers/xen/tpmback/interface.c
-+++ b/drivers/xen/tpmback/interface.c
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/interface.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/tpmback/interface.c 2009-03-04 11:25:55.000000000 +0100
@@ -156,13 +156,14 @@ void tpmif_disconnect_complete(tpmif_t *
free_tpmif(tpmif);
}
{
kmem_cache_destroy(tpmif_cachep);
}
---- a/drivers/xen/tpmback/tpmback.c
-+++ b/drivers/xen/tpmback/tpmback.c
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/tpmback.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/tpmback/tpmback.c 2009-03-04 11:25:55.000000000 +0100
@@ -923,22 +923,30 @@ static int __init tpmback_init(void)
spin_lock_init(&tpm_schedule_list_lock);
INIT_LIST_HEAD(&tpm_schedule_list);
+module_exit(tpmback_exit)
MODULE_LICENSE("Dual BSD/GPL");
---- a/drivers/xen/tpmback/xenbus.c
-+++ b/drivers/xen/tpmback/xenbus.c
+--- sle11-2009-05-14.orig/drivers/xen/tpmback/xenbus.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/tpmback/xenbus.c 2009-03-04 11:25:55.000000000 +0100
@@ -270,7 +270,6 @@ static const struct xenbus_device_id tpm
static struct xenbus_driver tpmback = {
}
void tpmif_xenbus_exit(void)
---- a/drivers/xen/xenbus/xenbus_probe_backend.c
-+++ b/drivers/xen/xenbus/xenbus_probe_backend.c
-@@ -172,13 +172,15 @@ static int xenbus_uevent_backend(struct
- return 0;
- }
-
--int xenbus_register_backend(struct xenbus_driver *drv)
-+int __xenbus_register_backend(struct xenbus_driver *drv,
-+ struct module *owner, const char *mod_name)
- {
- drv->read_otherend_details = read_frontend_details;
-
-- return xenbus_register_driver_common(drv, &xenbus_backend);
-+ return xenbus_register_driver_common(drv, &xenbus_backend,
-+ owner, mod_name);
- }
--EXPORT_SYMBOL_GPL(xenbus_register_backend);
-+EXPORT_SYMBOL_GPL(__xenbus_register_backend);
-
- /* backend/<typename>/<frontend-uuid>/<name> */
- static int xenbus_probe_backend_unit(const char *dir,
---- a/drivers/xen/xenbus/xenbus_probe.c
-+++ b/drivers/xen/xenbus/xenbus_probe.c
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.c 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.c 2009-03-04 11:25:55.000000000 +0100
@@ -365,7 +365,9 @@ static void xenbus_dev_shutdown(struct d
}
void xenbus_unregister_driver(struct xenbus_driver *drv)
{
---- a/drivers/xen/xenbus/xenbus_probe.h
-+++ b/drivers/xen/xenbus/xenbus_probe.h
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe.h 2009-03-04 11:25:55.000000000 +0100
@@ -63,7 +63,9 @@ extern int xenbus_match(struct device *_
extern int xenbus_dev_probe(struct device *_dev);
extern int xenbus_dev_remove(struct device *_dev);
extern int xenbus_probe_node(struct xen_bus_type *bus,
const char *type,
const char *nodename);
---- a/drivers/xen/xenoprof/xenoprofile.c
-+++ b/drivers/xen/xenoprof/xenoprofile.c
+--- sle11-2009-05-14.orig/drivers/xen/xenbus/xenbus_probe_backend.c 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/drivers/xen/xenbus/xenbus_probe_backend.c 2009-03-04 11:25:55.000000000 +0100
+@@ -172,13 +172,15 @@ static int xenbus_uevent_backend(struct
+ return 0;
+ }
+
+-int xenbus_register_backend(struct xenbus_driver *drv)
++int __xenbus_register_backend(struct xenbus_driver *drv,
++ struct module *owner, const char *mod_name)
+ {
+ drv->read_otherend_details = read_frontend_details;
+
+- return xenbus_register_driver_common(drv, &xenbus_backend);
++ return xenbus_register_driver_common(drv, &xenbus_backend,
++ owner, mod_name);
+ }
+-EXPORT_SYMBOL_GPL(xenbus_register_backend);
++EXPORT_SYMBOL_GPL(__xenbus_register_backend);
+
+ /* backend/<typename>/<frontend-uuid>/<name> */
+ static int xenbus_probe_backend_unit(const char *dir,
+--- sle11-2009-05-14.orig/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:28:34.000000000 +0100
++++ sle11-2009-05-14/drivers/xen/xenoprof/xenoprofile.c 2009-03-04 11:25:55.000000000 +0100
@@ -235,7 +235,7 @@ static int bind_virq(void)
result = bind_virq_to_irqhandler(VIRQ_XENOPROF,
i,
"xenoprof",
NULL);
---- a/include/asm-x86/i8253.h
-+++ b/include/asm-x86/i8253.h
+--- sle11-2009-05-14.orig/include/asm-x86/i8253.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/i8253.h 2009-03-04 11:25:55.000000000 +0100
@@ -8,10 +8,14 @@
extern spinlock_t i8253_lock;
#define inb_pit inb_p
#define outb_pit outb_p
---- a/include/asm-x86/mach-xen/asm/desc_32.h
-+++ b/include/asm-x86/mach-xen/asm/desc_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/desc_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/desc_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -21,7 +21,7 @@ struct Xgt_desc_struct {
extern struct Xgt_desc_struct idt_descr;
static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
{
---- a/include/asm-x86/mach-xen/asm/dma-mapping_64.h
-+++ b/include/asm-x86/mach-xen/asm/dma-mapping_64.h
-@@ -9,7 +9,6 @@
-
- #include <asm/scatterlist.h>
- #include <asm/io.h>
--#include <asm/swiotlb.h>
-
- struct dma_mapping_ops {
- int (*mapping_error)(dma_addr_t dma_addr);
-@@ -67,6 +66,9 @@ static inline int dma_mapping_error(dma_
- #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
- #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-
-+#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
-+#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
-+
- extern void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t gfp);
- extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
---- a/include/asm-x86/mach-xen/asm/hypervisor.h
-+++ b/include/asm-x86/mach-xen/asm/hypervisor.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/hypervisor.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/hypervisor.h 2009-03-04 11:28:11.000000000 +0100
@@ -158,6 +158,19 @@ static inline void arch_leave_lazy_mmu_m
#define arch_use_lazy_mmu_mode() unlikely(__get_cpu_var(xen_lazy_mmu))
#endif
+}
+#endif
+
- #else /* CONFIG_XEN */
+ #else /* !CONFIG_XEN || MODULE */
static inline void xen_multicall_flush(bool ignore) {}
@@ -215,7 +228,7 @@ HYPERVISOR_block(
HYPERVISOR_shutdown(
unsigned int reason)
{
---- a/include/asm-x86/mach-xen/asm/io_32.h
-+++ b/include/asm-x86/mach-xen/asm/io_32.h
-@@ -232,12 +232,6 @@ static inline void memcpy_toio(volatile
- #define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
-
- /*
-- * Again, i386 does not require mem IO specific function.
-- */
--
--#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void __force *)(b),(c),(d))
--
--/*
- * Cache management
- *
- * This needed for two cases
---- a/include/asm-x86/mach-xen/asm/io_64.h
-+++ b/include/asm-x86/mach-xen/asm/io_64.h
-@@ -101,7 +101,7 @@ __OUTS(l)
-
- #define IO_SPACE_LIMIT 0xffff
-
--#if defined(__KERNEL__) && __x86_64__
-+#if defined(__KERNEL__) && defined(__x86_64__)
-
- #include <linux/vmalloc.h>
-
-@@ -267,12 +267,6 @@ void memset_io(volatile void __iomem *a,
- */
- #define __ISA_IO_base ((char __iomem *)(fix_to_virt(FIX_ISAMAP_BEGIN)))
-
--/*
-- * Again, x86-64 does not require mem IO specific function.
-- */
--
--#define eth_io_copy_and_sum(a,b,c,d) eth_copy_and_sum((a),(void *)(b),(c),(d))
--
- /* Nothing to do */
-
- #define dma_cache_inv(_start,_size) do { } while (0)
---- a/include/asm-x86/mach-xen/asm/mmu_context_32.h
-+++ b/include/asm-x86/mach-xen/asm/mmu_context_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/mmu_context_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/mmu_context_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -27,13 +27,13 @@ static inline void enter_lazy_tlb(struct
static inline void __prepare_arch_switch(void)
{
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
---- a/include/asm-x86/mach-xen/asm/pgalloc_32.h
-+++ b/include/asm-x86/mach-xen/asm/pgalloc_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-05-14 10:56:29.000000000 +0200
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgalloc_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -6,12 +6,23 @@
#include <linux/mm.h> /* for struct page */
#include <asm/io.h> /* for phys_to_virt and page_to_pseudophys */
#ifdef CONFIG_X86_PAE
/*
---- a/include/asm-x86/mach-xen/asm/pgtable_32.h
-+++ b/include/asm-x86/mach-xen/asm/pgtable_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -275,6 +275,7 @@ static inline pte_t pte_mkhuge(pte_t pte
*/
#define pte_update(mm, addr, ptep) do { } while (0)
#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
#else
---- a/include/asm-x86/mach-xen/asm/pgtable_64.h
-+++ b/include/asm-x86/mach-xen/asm/pgtable_64.h
-@@ -414,15 +414,6 @@ static inline int pmd_large(pmd_t pte) {
- #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
- #define mk_pte_huge(entry) (__pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
-
--/* physical address -> PTE */
--static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
--{
-- unsigned long pteval;
-- pteval = physpage | pgprot_val(pgprot);
-- pteval &= __supported_pte_mask;
-- return __pte(pteval);
--}
--
- /* Change flags of a PTE */
- static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
- {
---- a/include/asm-x86/mach-xen/asm/processor_32.h
-+++ b/include/asm-x86/mach-xen/asm/processor_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/processor_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/processor_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -431,7 +431,7 @@ struct thread_struct {
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
set_fs(USER_DS); \
regs->xds = __USER_DS; \
regs->xes = __USER_DS; \
---- a/include/asm-x86/mach-xen/asm/segment_32.h
-+++ b/include/asm-x86/mach-xen/asm/segment_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/segment_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/segment_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -83,14 +83,8 @@
* The GDT has 32 entries
*/
+#define SEGMENT_IS_PNP_CODE(x) (((x) & ~0x0b) == GDT_ENTRY_PNPBIOS_BASE * 8)
+
#endif
---- a/include/asm-x86/mach-xen/asm/smp_32.h
-+++ b/include/asm-x86/mach-xen/asm/smp_32.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_32.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_32.h 2009-03-04 11:25:55.000000000 +0100
@@ -52,6 +52,11 @@ extern void cpu_exit_clear(void);
extern void cpu_uninit(void);
#endif
/*
* This function is needed by all SMP systems. It must _always_ be valid
* from the initial startup. We map APIC_BASE very early in page_setup(),
---- a/include/asm-x86/mach-xen/asm/smp_64.h
-+++ b/include/asm-x86/mach-xen/asm/smp_64.h
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/dma-mapping_64.h 2009-03-04 11:25:55.000000000 +0100
+@@ -9,7 +9,6 @@
+
+ #include <asm/scatterlist.h>
+ #include <asm/io.h>
+-#include <asm/swiotlb.h>
+
+ struct dma_mapping_ops {
+ int (*mapping_error)(dma_addr_t dma_addr);
+@@ -67,6 +66,9 @@ static inline int dma_mapping_error(dma_
+ #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
+ #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
+
++#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
++#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
++
+ extern void *dma_alloc_coherent(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t gfp);
+ extern void dma_free_coherent(struct device *dev, size_t size, void *vaddr,
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/pgtable_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/pgtable_64.h 2009-03-04 11:25:55.000000000 +0100
+@@ -416,15 +416,6 @@ static inline int pmd_large(pmd_t pte) {
+ #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
+ #define mk_pte_huge(entry) (__pte_val(entry) |= _PAGE_PRESENT | _PAGE_PSE)
+
+-/* physical address -> PTE */
+-static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
+-{
+- unsigned long pteval;
+- pteval = physpage | pgprot_val(pgprot);
+- pteval &= __supported_pte_mask;
+- return __pte(pteval);
+-}
+-
+ /* Change flags of a PTE */
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+--- sle11-2009-05-14.orig/include/asm-x86/mach-xen/asm/smp_64.h 2008-12-15 11:26:44.000000000 +0100
++++ sle11-2009-05-14/include/asm-x86/mach-xen/asm/smp_64.h 2009-03-04 11:25:55.000000000 +0100
@@ -7,6 +7,7 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
#define NO_PROC_ID 0xFF /* No processor magic marker */
---- a/include/xen/xenbus.h
-+++ b/include/xen/xenbus.h
+--- sle11-2009-05-14.orig/include/xen/xenbus.h 2008-11-25 12:35:56.000000000 +0100
++++ sle11-2009-05-14/include/xen/xenbus.h 2009-03-04 11:25:55.000000000 +0100
@@ -93,8 +93,7 @@ struct xenbus_device_id
/* A xenbus driver. */
void xenbus_unregister_driver(struct xenbus_driver *drv);
struct xenbus_transaction
---- a/lib/swiotlb-xen.c
-+++ b/lib/swiotlb-xen.c
+--- sle11-2009-05-14.orig/lib/swiotlb-xen.c 2009-03-20 10:00:58.000000000 +0100
++++ sle11-2009-05-14/lib/swiotlb-xen.c 2009-03-04 11:25:55.000000000 +0100
@@ -135,8 +135,8 @@ __setup("swiotlb=", setup_io_tlb_npages)
* Statically reserve bounce buffer space and initialize bounce buffer data
* structures for the software IO TLB used to implement the PCI DMA API.
swiotlb_init(void)
{
long ram_end;
-@@ -457,7 +457,7 @@ swiotlb_full(struct device *dev, size_t
+@@ -457,8 +457,8 @@ swiotlb_full(struct device *dev, size_t
* When the mapping is small enough return a static buffer to limit
* the damage, or panic when the transfer is too big.
*/
- printk(KERN_ERR "PCI-DMA: Out of SW-IOMMU space for %lu bytes at "
+- "device %s\n", (unsigned long)size, dev ? dev->bus_id : "?");
+ printk(KERN_ERR "PCI-DMA: Out of SW-IOMMU space for %zu bytes at "
- "device %s\n", (unsigned long)size, dev ? dev->bus_id : "?");
++ "device %s\n", size, dev ? dev->bus_id : "?");
if (size > io_tlb_overflow && do_panic) {
+ if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL)
@@ -602,7 +602,7 @@ swiotlb_map_sg(struct device *hwdev, str
sg[0].dma_length = 0;
return 0;
projects / people / pmueller / ipfire-2.x.git / blobdiff