mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
[linux] Update to linux-2.6.16.29.
Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
This commit is contained in:
Christian Limpach committed
1 parent
ee6939c833
commit
42ee90deeb
10 files changed
+28
-14
No files matched your search
@@ -1,5 +1,5 @@
|
||||
LINUX_SERIES = 2.6
|
||||
LINUX_VER = 2.6.16.13
|
||||
LINUX_VER = 2.6.16.29
|
||||
|
||||
EXTRAVERSION ?= xen
|
||||
|
||||
|
||||
@@ -789,6 +789,9 @@ config DOUBLEFAULT
|
||||
|
||||
endmenu
|
||||
|
||||
config ARCH_ENABLE_MEMORY_HOTPLUG
|
||||
def_bool y
|
||||
depends on HIGHMEM
|
||||
|
||||
menu "Power management options (ACPI, APM)"
|
||||
depends on !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)
|
||||
|
||||
@@ -276,6 +276,9 @@ config HOTPLUG_CPU
|
||||
can be controlled through /sys/devices/system/cpu/cpu#.
|
||||
Say N if you want to disable CPU hotplug.
|
||||
|
||||
config ARCH_ENABLE_MEMORY_HOTPLUG
|
||||
def_bool y
|
||||
|
||||
config SCHED_SMT
|
||||
bool "SMT scheduler support"
|
||||
depends on SMP
|
||||
|
||||
@@ -368,6 +368,8 @@ config HOTPLUG_CPU
|
||||
can be controlled through /sys/devices/system/cpu/cpu#.
|
||||
Say N if you want to disable CPU hotplug.
|
||||
|
||||
config ARCH_ENABLE_MEMORY_HOTPLUG
|
||||
def_bool y
|
||||
|
||||
config HPET_TIMER
|
||||
bool
|
||||
|
||||
@@ -316,12 +316,7 @@ tracesys:
|
||||
ja 1f
|
||||
movq %r10,%rcx /* fixup for C */
|
||||
call *sys_call_table(,%rax,8)
|
||||
movq %rax,RAX-ARGOFFSET(%rsp)
|
||||
1: SAVE_REST
|
||||
movq %rsp,%rdi
|
||||
call syscall_trace_leave
|
||||
RESTORE_TOP_OF_STACK %rbx
|
||||
RESTORE_REST
|
||||
1: movq %rax,RAX-ARGOFFSET(%rsp)
|
||||
/* Use IRET because user could have changed frame */
|
||||
jmp int_ret_from_sys_call
|
||||
CFI_ENDPROC
|
||||
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <linux/moduleparam.h>
|
||||
#include <linux/nmi.h>
|
||||
#include <linux/kprobes.h>
|
||||
#include <linux/kexec.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
#include <asm/uaccess.h>
|
||||
@@ -438,6 +439,8 @@ void __kprobes __die(const char * str, struct pt_regs * regs, long err)
|
||||
printk(KERN_ALERT "RIP ");
|
||||
printk_address(regs->rip);
|
||||
printk(" RSP <%016lx>\n", regs->rsp);
|
||||
if (kexec_should_crash(current))
|
||||
crash_kexec(regs);
|
||||
}
|
||||
|
||||
void die(const char * str, struct pt_regs * regs, long err)
|
||||
@@ -461,6 +464,8 @@ void __kprobes die_nmi(char *str, struct pt_regs *regs)
|
||||
*/
|
||||
printk(str, safe_smp_processor_id());
|
||||
show_registers(regs);
|
||||
if (kexec_should_crash(current))
|
||||
crash_kexec(regs);
|
||||
if (panic_on_timeout || panic_on_oops)
|
||||
panic("nmi watchdog");
|
||||
printk("console shuts up ...\n");
|
||||
|
||||
@@ -2761,7 +2761,7 @@ static void flush_to_ldisc(void *private_)
|
||||
struct tty_struct *tty = (struct tty_struct *) private_;
|
||||
unsigned long flags;
|
||||
struct tty_ldisc *disc;
|
||||
struct tty_buffer *tbuf;
|
||||
struct tty_buffer *tbuf, *head;
|
||||
int count;
|
||||
char *char_buf;
|
||||
unsigned char *flag_buf;
|
||||
@@ -2778,7 +2778,9 @@ static void flush_to_ldisc(void *private_)
|
||||
goto out;
|
||||
}
|
||||
spin_lock_irqsave(&tty->buf.lock, flags);
|
||||
while((tbuf = tty->buf.head) != NULL) {
|
||||
head = tty->buf.head;
|
||||
tty->buf.head = NULL;
|
||||
while((tbuf = head) != NULL) {
|
||||
while ((count = tbuf->commit - tbuf->read) != 0) {
|
||||
char_buf = tbuf->char_buf_ptr + tbuf->read;
|
||||
flag_buf = tbuf->flag_buf_ptr + tbuf->read;
|
||||
@@ -2787,10 +2789,12 @@ static void flush_to_ldisc(void *private_)
|
||||
disc->receive_buf(tty, char_buf, flag_buf, count);
|
||||
spin_lock_irqsave(&tty->buf.lock, flags);
|
||||
}
|
||||
if (tbuf->active)
|
||||
if (tbuf->active) {
|
||||
tty->buf.head = head;
|
||||
break;
|
||||
tty->buf.head = tbuf->next;
|
||||
if (tty->buf.head == NULL)
|
||||
}
|
||||
head = tbuf->next;
|
||||
if (head == NULL)
|
||||
tty->buf.tail = NULL;
|
||||
tty_buffer_free(tty, tbuf);
|
||||
}
|
||||
|
||||
@@ -821,6 +821,7 @@ config SERIAL_ICOM
|
||||
tristate "IBM Multiport Serial Adapter"
|
||||
depends on PCI && (PPC_ISERIES || PPC_PSERIES)
|
||||
select SERIAL_CORE
|
||||
select FW_LOADER
|
||||
help
|
||||
This driver is for a family of multiport serial adapters
|
||||
including 2 port RVX, 2 port internal modem, 4 port internal
|
||||
|
||||
@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME
|
||||
# eventually, we can have this option just 'select SPARSEMEM'
|
||||
config MEMORY_HOTPLUG
|
||||
bool "Allow for memory hot-add"
|
||||
depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
|
||||
depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
|
||||
|
||||
comment "Memory hotplug is currently incompatible with Software Suspend"
|
||||
depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
|
||||
|
||||
@@ -951,7 +951,8 @@ restart:
|
||||
alloc_flags |= ALLOC_HARDER;
|
||||
if (gfp_mask & __GFP_HIGH)
|
||||
alloc_flags |= ALLOC_HIGH;
|
||||
alloc_flags |= ALLOC_CPUSET;
|
||||
if (wait)
|
||||
alloc_flags |= ALLOC_CPUSET;
|
||||
|
||||
/*
|
||||
* Go through the zonelist again. Let __GFP_HIGH and allocations
|
||||
|
||||