-
- Downloads
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- arch/x86/kernel/cpu/mtrr/main.c 1 addition, 1 deletionarch/x86/kernel/cpu/mtrr/main.c
- arch/x86/kernel/ioport.c 1 addition, 0 deletionsarch/x86/kernel/ioport.c
- arch/x86/kernel/ipi.c 2 additions, 1 deletionarch/x86/kernel/ipi.c
- arch/x86/kernel/ldt.c 1 addition, 0 deletionsarch/x86/kernel/ldt.c
- arch/x86/kernel/process_32.c 2 additions, 0 deletionsarch/x86/kernel/process_32.c
- arch/x86/kernel/process_64.c 1 addition, 0 deletionsarch/x86/kernel/process_64.c
- arch/x86/kernel/ptrace.c 1 addition, 1 deletionarch/x86/kernel/ptrace.c
- arch/x86/kernel/signal_32.c 1 addition, 0 deletionsarch/x86/kernel/signal_32.c
- arch/x86/kernel/signal_64.c 1 addition, 0 deletionsarch/x86/kernel/signal_64.c
- arch/x86/kernel/smpboot.c 2 additions, 2 deletionsarch/x86/kernel/smpboot.c
- arch/x86/kernel/sys_i386_32.c 2 additions, 0 deletionsarch/x86/kernel/sys_i386_32.c
- arch/x86/kernel/sys_x86_64.c 1 addition, 0 deletionsarch/x86/kernel/sys_x86_64.c
- arch/x86/kernel/time_32.c 1 addition, 0 deletionsarch/x86/kernel/time_32.c
- arch/x86/kernel/tls.c 1 addition, 0 deletionsarch/x86/kernel/tls.c
- arch/x86/kernel/vm86_32.c 1 addition, 0 deletionsarch/x86/kernel/vm86_32.c
- arch/x86/mach-default/setup.c 3 additions, 1 deletionarch/x86/mach-default/setup.c
- arch/x86/mm/fault.c 1 addition, 2 deletionsarch/x86/mm/fault.c
- arch/x86/mm/init_32.c 1 addition, 0 deletionsarch/x86/mm/init_32.c
- arch/x86/mm/ioremap.c 2 additions, 2 deletionsarch/x86/mm/ioremap.c
- include/asm-x86/apic.h 5 additions, 0 deletionsinclude/asm-x86/apic.h
Loading
Please register or sign in to comment