Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
29 files changed:
1  2  3  4 
arch/x86/Kconfig
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/mm/ioremap.c
include/asm-x86/apic.h
include/asm-x86/e820.h
include/asm-x86/hw_irq.h
include/asm-x86/i387.h
include/asm-x86/io.h
include/asm-x86/io_64.h
include/asm-x86/kvm_host.h
include/asm-x86/page_32.h
include/asm-x86/page_64.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/processor.h
include/asm-x86/ptrace.h
include/asm-x86/setup.h
include/asm-x86/signal.h
include/asm-x86/smp.h
include/asm-x86/thread_info.h
include/asm-x86/time.h
include/asm-x86/timer.h
include/asm-x86/traps.h

index ed92864d1325c09092f3e8ed4918f26341f23161,ebfd7ff82adedac112e1826871b8ba2c443bafbc,0a80d6a5e9f1199fb85b49821f1cb6fee6c69bd1,ac2fb0641a041e4a28055867140f458613673dc2..6b8fc9003eccbe2f7a500395f1a77533fbe0ec0e
@@@@@ -586,11 -587,11 -585,17 -585,17 +587,11 @@@@@ config MAXSM
          Configure maximum number of CPUS and NUMA Nodes for this architecture.
          If unsure, say N.
    
  --if MAXSMP
  - config NR_CPUS
  -     int
  -     default "4096"
  - endif
  - 
  - if !MAXSMP
    config NR_CPUS
   -    int
   -    default "4096"
   -endif
   -
   -if !MAXSMP
   -config NR_CPUS
  --    int "Maximum number of CPUs (2-4096)"
  --    range 2 4096
  ++    int "Maximum number of CPUs (2-512)" if !MAXSMP
  ++    range 2 512
        depends on SMP
  ++    default "4096" if MAXSMP
        default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000
        default "8"
        help
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ca316b5b742ced782dc3ab4b4c8631b5a9d43a6c,1e1933892b4fe115fd18676af49decf5ae267a7f,6c581698ab56887292596e56729dc200b6f750f8,02b02583f5b5c08d3d0e33c82f5634ebfb9de4b2..2f28252d2d26cfeb847be6c2116340aa5c0f5b51
    #include <asm/proto.h>
    #include <asm/ia32_unistd.h>
    #include <asm/mce.h>
+ ++#include <asm/syscall.h>
+++ #include <asm/syscalls.h>
    #include "sigframe.h"
    
    #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@@@@ -53,69 -55,69 -53,6 -54,60 +56,6 @@@@@ sys_sigaltstack(const stack_t __user *u
        return do_sigaltstack(uss, uoss, regs->sp);
    }
    
-- -/*
-- - * Signal frame handlers.
-- - */
-- -
-- -static inline int save_i387(struct _fpstate __user *buf)
-- -{
-- -    struct task_struct *tsk = current;
-- -    int err = 0;
-- -
-- -    BUILD_BUG_ON(sizeof(struct user_i387_struct) !=
-- -                    sizeof(tsk->thread.xstate->fxsave));
-- -
-- -    if ((unsigned long)buf % 16)
-- -            printk("save_i387: bad fpstate %p\n", buf);
-- -
-- -    if (!used_math())
-- -            return 0;
-- -    clear_used_math(); /* trigger finit */
-- -    if (task_thread_info(tsk)->status & TS_USEDFPU) {
-- -            err = save_i387_checking((struct i387_fxsave_struct __user *)
-- -                                     buf);
-- -            if (err)
-- -                    return err;
-- -            task_thread_info(tsk)->status &= ~TS_USEDFPU;
-- -            stts();
-- -    } else {
-- -            if (__copy_to_user(buf, &tsk->thread.xstate->fxsave,
-- -                               sizeof(struct i387_fxsave_struct)))
-- -                    return -1;
-- -    }
-- -    return 1;
-- -}
-- -
-- -/*
-- - * This restores directly out of user space. Exceptions are handled.
-- - */
-- -static inline int restore_i387(struct _fpstate __user *buf)
-- -{
-- -    struct task_struct *tsk = current;
-- -    int err;
-- -
-- -    if (!used_math()) {
-- -            err = init_fpu(tsk);
-- -            if (err)
-- -                    return err;
-- -    }
-- -
-- -    if (!(task_thread_info(current)->status & TS_USEDFPU)) {
-- -            clts();
-- -            task_thread_info(current)->status |= TS_USEDFPU;
--      }
--      err = restore_fpu_checking((__force struct i387_fxsave_struct *)buf);
--      if (unlikely(err)) {
--              /*
--               * Encountered an error while doing the restore from the
--               * user buffer, clear the fpu state.
--               */
--              clear_fpu(tsk);
--              clear_used_math();
-- -    }
--      return err;
   -    return restore_fpu_checking((__force struct i387_fxsave_struct *)buf);
-- -}
-- -
    /*
     * Do a signal return; undo the signal stack.
     */
Simple merge
Simple merge
index 133c998161ca4930dae0efe954802a45af2d62d4,133c998161ca4930dae0efe954802a45af2d62d4,bc2e364bdb1007c12a4c22e3a8e48a14393eef61,519ad65708e7e6ea408f94ddd8c35c733ed015d4..1311c82b165bf45ad373c6af43a2193de00a013a
@@@@@ -54,8 -54,8 -54,8 -54,13 +54,13 @@@@@ extern int disable_apic
    #endif
    
    extern int is_vsmp_box(void);
+++ extern void xapic_wait_icr_idle(void);
+++ extern u32 safe_xapic_wait_icr_idle(void);
+++ extern u64 xapic_icr_read(void);
+++ extern void xapic_icr_write(u32, u32);
+++ extern int setup_profiling_timer(unsigned int);
    
-- -static inline void native_apic_write(unsigned long reg, u32 v)
++ +static inline void native_apic_mem_write(u32 reg, u32 v)
    {
        volatile u32 *addr = (volatile u32 *)(APIC_BASE + reg);
    
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index a4b65a71bd6609e46f3da39969b522fa4958f0da,a4b65a71bd6609e46f3da39969b522fa4958f0da,2a891a704719163a0c08d2d7dd2f07303a54691c,b60fab546da7625d388e3c8d085dfa266fee7b01..2ccebc6fb0b0143c9605ab548662718dacb8b97d
@@@@@ -62,5 -62,5 -62,5 -64,7 +64,7 @@@@@ asmlinkage void do_coprocessor_error(st
    asmlinkage void do_simd_coprocessor_error(struct pt_regs *);
    asmlinkage void do_spurious_interrupt_bug(struct pt_regs *);
    
+++ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code);
+++ 
    #endif /* CONFIG_X86_32 */
-- -#endif /* _ASM_X86_TRAPS_H */
++ +#endif /* ASM_X86__TRAPS_H */