diff options
| author | Ingo Molnar | 2008-12-02 20:09:50 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-12-02 20:09:50 +0100 |
| commit | a64d31baed104be25305e9c71585d3ea4ee9a418 (patch) | |
| tree | 470e3c59ef39f38bcd69f8fef7dba8f76afbec53 /arch/ia64 | |
| parent | sched: convert struct root_domain to cpumask_var_t, fix (diff) | |
| parent | Linux 2.6.28-rc7 (diff) | |
| download | kernel-qcow2-linux-a64d31baed104be25305e9c71585d3ea4ee9a418.tar.gz kernel-qcow2-linux-a64d31baed104be25305e9c71585d3ea4ee9a418.tar.xz kernel-qcow2-linux-a64d31baed104be25305e9c71585d3ea4ee9a418.zip | |
Merge branch 'linus' into cpus4096
Conflicts:
kernel/trace/ring_buffer.c
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/ptrace.h | 2 | ||||
| -rw-r--r-- | arch/ia64/sn/kernel/io_init.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/ia64/include/asm/ptrace.h b/arch/ia64/include/asm/ptrace.h index 6417c1ecb44e..14055c636adf 100644 --- a/arch/ia64/include/asm/ptrace.h +++ b/arch/ia64/include/asm/ptrace.h @@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) #define arch_has_block_step() (1) extern void user_enable_block_step(struct task_struct *); -#define __ARCH_WANT_COMPAT_SYS_PTRACE - #endif /* !__KERNEL__ */ /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index c3aa851d1ca6..4e1801bad83a 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c @@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup); * sn_pci_controller_fixup() - This routine sets up a bus's resources * consistent with the Linux PCI abstraction layer. */ -static void +static void __init sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) { s64 status = 0; |