Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

5e62feab

Commit 5e62feab authored 14 years ago by Thomas Gleixner

Downloads
- Plain Diff

Merge branch 'x86/cleanups' into irq/sparseirq


Reason: Avoid conflicts with removal of boot_cpu_id

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parents 8ffcfa4e 234bb549

Branches

Tags

No related merge requests found

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

arch/x86/include/asm/apb_timer.h 0 additions, 1 deletion

arch/x86/include/asm/apb_timer.h
arch/x86/include/asm/cpu.h 0 additions, 1 deletion

arch/x86/include/asm/cpu.h
arch/x86/kernel/apb_timer.c 1 addition, 1 deletion

arch/x86/kernel/apb_timer.c
arch/x86/kernel/apic/io_apic.c 6 additions, 6 deletions

arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/cpu/amd.c 1 addition, 1 deletion

arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/common.c 1 addition, 1 deletion

arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c 1 addition, 1 deletion

arch/x86/kernel/cpu/intel.c
arch/x86/kernel/early-quirks.c 0 additions, 2 deletions

arch/x86/kernel/early-quirks.c
arch/x86/kernel/machine_kexec_64.c 2 additions, 2 deletions

arch/x86/kernel/machine_kexec_64.c
arch/x86/kernel/reboot.c 1 addition, 1 deletion

arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c 0 additions, 1 deletion

arch/x86/kernel/setup.c
arch/x86/kernel/setup_percpu.c 1 addition, 1 deletion

arch/x86/kernel/setup_percpu.c
arch/x86/kvm/lapic.c 1 addition, 2 deletions

arch/x86/kvm/lapic.c
arch/x86/mm/init_32.c 2 additions, 2 deletions

arch/x86/mm/init_32.c
arch/x86/mm/init_64.c 1 addition, 1 deletion

arch/x86/mm/init_64.c
arch/x86/mm/k8topology_64.c 3 additions, 3 deletions

arch/x86/mm/k8topology_64.c

with 21 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment