* [git pull] x86 updates for v2.6.27, phase #2
@ 2008-07-21 15:04 Ingo Molnar
2008-07-21 15:32 ` Ingo Molnar
0 siblings, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2008-07-21 15:04 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Andrew Morton
Linus,
Please pull the latest x86/for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86/for-linus
This contains updates from the following 21 x86 topics:
x86/urgent, x86/amd-iommu, x86/apic, x86/cleanups, x86/core,
x86/cpu, x86/fixmap, x86/gart, x86/kprobes, x86/memtest,
x86/modules, x86/nmi, x86/pat, x86/reboot, x86/setup,
x86/step, x86/unify-pci, x86/uv, x86/xen, xen-64bit,
x86/paravirt-spinlocks.
The biggest one is xen-64bit+paravirt-spinlocks - these were done in
time for the merge window and were stable and mergable, they just
depended massively on topics that are now upstream.
x86/unify-pci has been acked by Jesse. x86/modules bears special mention
as well (commit 5e5a29bf2). I'd like to also give a special mention to:
# 3f9b5cc01, x86: re-enable OPTIMIZE_INLINING
this change became possible due to UML fix 4f81c535 from Jeff Dike. It
defaults to off, it just moves out from under the scope of
CONFIG_BROKEN. (now that all known breakages have been fixed)
out-of-topic modifications in x86/for-linus:
--------------------------------------------
include/linux/debugfs.h # ae79cda: x86: Add a arch directory for x86
kernel/power/Kconfig # 93a0886: x86, xen, power: fix up config de
# 6717ef1: Revert "suspend, xen: enable PM_S
# 0775b3d: suspend, xen: enable PM_SLEEP for
Thanks,
Ingo
------------------>
Akinobu Mita (1):
x86, intel_cacheinfo: fix use-after-free cache_kobject
Alexander Beregalov (2):
x86 setup.c: cleanup includes
arch/x86/kernel/cpu/common_64.c: remove double inclusions
Alexander van Heukelum (3):
x86, cleanup: fix description of __fls(): __fls(0) is undefined
x86: traps_xx: refactor die() like in x86_64
x86: traps_xx: modify x86_64 to use _log_lvl variants
Anders H Kaseorg (1):
x86, 64-bit: patch paravirt inline replacements when loading modules
Cyrill Gorcunov (5):
x86: idle process - add checking for NULL early param
x86: io delay - add checking for NULL early param
x86: smpboot maxcpus - add checking for NULL early param
x86: apic_64 - make calibrate_APIC_clock to return error code
x86: apic_32 - introduce calibrate_APIC_clock
Eduardo Habkost (6):
x86/paravirt: call paravirt_pagetable_setup_{start, done}
pvops-64: call paravirt_post_allocator_init() on setup_arch()
xen64: xen_write_idt_entry() and cvt_gate_to_trap()
Xen64: HYPERVISOR_set_segment_base() implementation
xen64: implement xen_load_gs_index()
xen64: Clear %fs on xen_load_tls()
FUJITA Tomonori (4):
x86: make only GART code include gart.h
x86: remove ifdef CONFIG_GART_IOMMU in pci-dma.c
x86: remove ifdef CONFIG_CALGARY_IOMMU in pci-dma.c
x86: remove ifdef CONFIG_SWIOTLB in pci-dma.c
H. Peter Anvin (2):
x86: unify and correct the GDT_ENTRY() macro
x86: unify and correct the GDT_ENTRY() macro
Harvey Harrison (1):
x86: suppress sparse returning void warnings
Herton Ronaldo Krzesinski (1):
Fix typos from signal_32/64.h merge
Hiroshi Shimamoto (3):
x86_64: ia32_signal.c: use macro instead of immediate
x86_32: remove redundant KERN_INFO
x86_64: ia32_signal.c: remove signal number conversion
Ingo Molnar (15):
xen64: fix !HVC_XEN build dependency
xen64: fix build error on 32-bit + !HIGHMEM
Revert "suspend, xen: enable PM_SLEEP for CONFIG_XEN"
Revert "x86_64: there's no need to preallocate level1_fixmap_pgt"
x86, xen, vdso: fix build error
x86: paravirt spinlocks, !CONFIG_SMP build fixes
x86: paravirt spinlocks, modular build fix
x86, paravirt-spinlocks: fix boot hang
x86 reboot quirks: add Dell Precision WorkStation T5400
x86: rename CONFIG_NONPROMISC_DEVMEM to CONFIG_PROMISC_DEVMEM
x86: remove arch/x86/kernel/smpcommon_32.c
x86: re-enable OPTIMIZE_INLINING
Subject: devmem, x86: fix rename of CONFIG_NONPROMISC_DEVMEM
x86, VisWS: turn into generic arch, eliminate leftover files
KVM: fix exception entry / build bug, on 64-bit
Isaku Yamahata (2):
xen-netfront: fix xennet_release_tx_bufs()
xen: add xen_arch_resume()/xen_timer_resume hook for ia64 support
Jan Beulich (6):
x86: check function status in EDD boot code
x86: fix two modpost warnings
x86: reduce forbid_dac's visibility
x86: reduce force_mwait visibility
i386/xen: add proper unwind annotations to xen_sysenter_target
x86: i386: reduce boot fixmap space
Jaswinder Singh (1):
x86: introducing asm-x86/traps.h
Jeremy Fitzhardinge (57):
x86_64: there's no need to preallocate level1_fixmap_pgt
x86: clean up formatting of __switch_to
x86: use __page_aligned_data/bss
x86_64: adjust exception frame in ia32entry
x86_64: unstatic get_local_pda
xen: print backtrace on multicall failure
xen: define set_pte from the outset
xen64: define asm/xen/interface for 64-bit
xen: make ELF notes work for 32 and 64 bit
xen: fix 64-bit hypercall variants
xen64: fix calls into hypercall page
xen64: add extra pv_mmu_ops
xen64: random ifdefs to mask out 32-bit only code
xen64: get active_mm from the pda
xen: move smp setup into smp.c
x86_64: add workaround for no %gs-based percpu
xen64: smp.c compile hacking
xen64: add xen-head code to head_64.S
xen64: add asm-offsets
xen64: add 64-bit assembler
xen64: use set_fixmap for shared_info structure
xen: cpu_detect is 32-bit only
xen64: add hypervisor callbacks for events, etc
xen64: early mapping setup
xen64: 64-bit starts using set_pte from very early
xen64: map an initial chunk of physical memory
xen32: create initial mappings like 64-bit
xen: fix truncation of machine address
xen64: use arbitrary_virt_to_machine for xen_set_pmd
xen: set num_processors
xen64: defer setting pagetable alloc/release ops
xen: use set_pte_vaddr
xen64: deal with extra words Xen pushes onto exception frames
xen64: add pvop for swapgs
xen64: register callbacks in arch-independent way
xen64: add identity irq->vector map
xen: rework pgd_walk to deal with 32/64 bit
xen: make sure the kernel command line is right
suspend, xen: enable PM_SLEEP for CONFIG_XEN
xen64: implement failsafe callback
xen64: implement 64-bit update_descriptor
xen64: save lots of registers
xen64: allocate and manage user pagetables
xen64: set up syscall and sysenter entrypoints for 64-bit
xen64: set up userspace syscall patch
xen: implement Xen write_msr operation
xen: update Kconfig to allow 64-bit Xen
xen64: disable 32-bit syscall/sysenter if not supported.
x86_64: further cleanup of 32-bit compat syscall mechanisms
x86: xen: no need to disable vdso32
x86_64: adjust exception frame on paranoid exceptions
x86/paravirt: add hooks for spinlock operations
paravirt: introduce a "lock-byte" spinlock implementation
xen: use lock-byte spinlock implementation
xen: implement Xen-specific spinlocks
x86, xen, power: fix up config dependencies on PM
xen: report hypervisor version
Joerg Roedel (18):
x86, AMD IOMMU: ignore detection of GART IOMMU
x86, AMD IOMMU: add comments to amd_iommu_types.h
x86, AMD IOMMU: add comments to the initialization code
x86, AMD IOMMU: add comments to core code
x86, AMD IOMMU: replace HIGH_U32 macro with upper_32_bits function
x86, AMD IOMMU: replace UPDATE_LAST_BDF macro with a function
x86, AMD IOMMU: replace TBL_SIZE macro with a function
x86, AMD IOMMU: remove unnecessary free checks from init code
x86, AMD IOMMU: add an emergency exit to the completion wait loop
x86, AMD IOMMU: rename struct command to iommu_cmd
x86, AMD IOMMU: remove unneeded initializations from command buffer allocation
x86, AMD IOMMU: use true/false instead of 0/1 for bool value
x86, AMD IOMMU: do runtime list initialization at compile time
x86, AMD IOMMU: replace memset with __GFP_ZERO for table allocation
x86, AMD IOMMU: replace self made size parsing with memparse call
x86, AMD IOMMU: fix device table entry size
x86, AMD IOMMU: replace DEVID macro with a function
AMD IOMMU: set iommu for device from ACPI code too
Maciej W. Rozycki (5):
x86: APIC: remove apic_write_around(); use alternatives
x86: I/O APIC: Include <asm/i8259.h> required by some code
x86: APIC: Make apic_verbosity unsigned
x86: I/O APIC: Always report how the timer has been set up
x86: more apic debugging
Peter Zijlstra (1):
Kprobe smoke test lockdep warning
Robert Richter (5):
x86/pci: Removing pci-y in Makefile
x86/pci: Changing subsystem initialization order for NUMA
x86/pci: renamed: numa.c -> numaq_32.c
x86/pci: renaming numa into numaq
x86/pci: Changing subsystem init for visws
Roland McGrath (4):
x86 ptrace: block-step fix
x86 ptrace: unify TIF_SINGLESTEP
x86 ptrace: unify syscall tracing
x86 ptrace: user-sets-TF nits
Russ Anderson (1):
x86 BIOS interface for RTC on SGI UV
Sebastian Siewior (1):
ftrace: copy + paste typo in asm/ftrace.h
Simon Arlott (1):
x86: add unknown_nmi_panic kernel parameter
Stephen Rothwell (1):
linux-next: pci tree build failure
Thomas Petazzoni (1):
x86: consolidate the definition of the force_mwait variable
Yinghai Lu (10):
x86: use cpu_clear in remove_cpu_from_maps
x86: seperate memtest from init_64.c
x86: enable memory tester support on 32-bit
x86: remove arch_get_ram_range
x86: improve debug printout: add target bootmem range in early_res_to_bootmem()
x86: introduce x86_quirks
x86: extend and use x86_quirks to clean up NUMAQ code
x86: add ->pre_time_init to x86_quirks
x86: use setup_clear_cpu_cap() when disabling the lapic
x86: remove extra calling to get ext cpuid level
venkatesh.pallipadi@intel.com (2):
x86: Add a arch directory for x86 under debugfs
x86: Add a debugfs interface to dump PAT memtype
Documentation/kernel-parameters.txt | 6 +-
arch/x86/Kconfig | 1 -
arch/x86/Kconfig.cpu | 4 -
arch/x86/Kconfig.debug | 11 +-
arch/x86/boot/edd.c | 5 +-
arch/x86/boot/pm.c | 6 -
arch/x86/configs/i386_defconfig | 2 +-
arch/x86/configs/x86_64_defconfig | 2 +-
arch/x86/ia32/ia32_signal.c | 11 +-
arch/x86/ia32/ia32entry.S | 18 +-
arch/x86/kernel/Makefile | 4 +-
arch/x86/kernel/acpi/sleep.c | 10 +-
arch/x86/kernel/amd_iommu.c | 231 +++++++++-
arch/x86/kernel/amd_iommu_init.c | 357 +++++++++++----
arch/x86/kernel/aperture_64.c | 1 +
arch/x86/kernel/apic_32.c | 175 ++++----
arch/x86/kernel/apic_64.c | 26 +-
arch/x86/kernel/asm-offsets_64.c | 11 +
arch/x86/kernel/bios_uv.c | 48 ++
arch/x86/kernel/cpu/amd.c | 2 -
arch/x86/kernel/cpu/amd_64.c | 2 +
arch/x86/kernel/cpu/bugs.c | 23 +-
arch/x86/kernel/cpu/common_64.c | 15 +-
arch/x86/kernel/cpu/intel.c | 10 +
arch/x86/kernel/cpu/intel_cacheinfo.c | 7 +-
arch/x86/kernel/cpu/mcheck/p4.c | 4 +-
arch/x86/kernel/e820.c | 33 +--
arch/x86/kernel/early-quirks.c | 5 +-
arch/x86/kernel/entry_32.S | 24 +-
arch/x86/kernel/entry_64.S | 120 +++++-
arch/x86/kernel/genx2apic_uv_x.c | 23 +
arch/x86/kernel/head64.c | 11 +-
arch/x86/kernel/head_64.S | 1 +
arch/x86/kernel/io_apic_32.c | 53 ++-
arch/x86/kernel/io_apic_64.c | 41 +-
arch/x86/kernel/io_delay.c | 3 +
arch/x86/kernel/ipi.c | 6 +-
arch/x86/kernel/irq_32.c | 7 +-
arch/x86/kernel/kdebugfs.c | 8 +
arch/x86/kernel/kprobes.c | 1 -
arch/x86/kernel/module_64.c | 10 +-
arch/x86/kernel/mpparse.c | 208 +--------
arch/x86/kernel/nmi.c | 11 +-
arch/x86/kernel/numaq_32.c | 197 ++++++++-
arch/x86/kernel/paravirt.c | 29 ++-
arch/x86/kernel/pci-calgary_64.c | 2 +-
arch/x86/kernel/pci-dma.c | 17 +-
arch/x86/kernel/pci-gart_64.c | 1 +
arch/x86/kernel/pci-nommu.c | 2 +-
arch/x86/kernel/pci-swiotlb_64.c | 2 +-
arch/x86/kernel/process.c | 5 +
arch/x86/kernel/process_64.c | 56 ++--
arch/x86/kernel/ptrace.c | 151 +++----
arch/x86/kernel/reboot.c | 8 +
arch/x86/kernel/setup.c | 22 +-
arch/x86/kernel/signal_32.c | 8 +-
arch/x86/kernel/signal_64.c | 6 -
arch/x86/kernel/smpboot.c | 56 +--
arch/x86/kernel/smpcommon_32.c | 1 -
arch/x86/kernel/step.c | 35 ++-
arch/x86/kernel/time_32.c | 1 +
arch/x86/kernel/traps_32.c | 118 +++---
arch/x86/kernel/traps_64.c | 48 +--
arch/x86/kernel/visws_quirks.c | 42 +-
arch/x86/kernel/vmi_32.c | 1 -
arch/x86/lguest/boot.c | 1 -
arch/x86/mach-default/setup.c | 34 +-
arch/x86/mm/Makefile | 1 +
arch/x86/mm/init_32.c | 5 +-
arch/x86/mm/init_64.c | 112 -----
arch/x86/mm/memtest.c | 123 +++++
arch/x86/mm/pat.c | 94 ++++-
arch/x86/pci/Makefile | 12 +-
arch/x86/pci/legacy.c | 9 +-
arch/x86/pci/{numa.c => numaq_32.c} | 4 +-
arch/x86/pci/pci.h | 3 +-
arch/x86/pci/visws.c | 23 +-
arch/x86/vdso/Makefile | 2 +-
arch/x86/vdso/vdso32-setup.c | 19 +-
arch/x86/vdso/vdso32.S | 13 +-
arch/x86/vdso/vma.c | 11 +-
arch/x86/xen/Kconfig | 14 +-
arch/x86/xen/Makefile | 2 +-
arch/x86/xen/enlighten.c | 697 ++++++++++++++++++++++------
arch/x86/xen/mmu.c | 316 +++++++++----
arch/x86/xen/mmu.h | 29 +-
arch/x86/xen/multicalls.c | 1 +
arch/x86/xen/setup.c | 79 +++-
arch/x86/xen/smp.c | 306 ++++++++++--
arch/x86/xen/suspend.c | 5 +-
arch/x86/xen/{xen-asm.S => xen-asm_32.S} | 0
arch/x86/xen/xen-asm_64.S | 271 +++++++++++
arch/x86/xen/xen-head.S | 28 +-
arch/x86/xen/xen-ops.h | 21 +-
drivers/char/mem.c | 2 +-
drivers/net/xen-netfront.c | 19 +-
drivers/pci/intel-iommu.c | 2 +-
drivers/xen/events.c | 27 ++
drivers/xen/manage.c | 10 +-
include/asm-x86/amd_iommu_types.h | 114 +++++-
include/asm-x86/apic.h | 28 +-
include/asm-x86/arch_hooks.h | 1 +
include/asm-x86/bitops.h | 2 +-
include/asm-x86/calling.h | 6 +-
include/asm-x86/cpufeature.h | 1 +
include/asm-x86/dma-mapping.h | 1 -
include/asm-x86/e820.h | 8 +
include/asm-x86/fixmap_32.h | 6 +-
include/asm-x86/ftrace.h | 2 +-
include/asm-x86/gart.h | 1 -
include/asm-x86/iommu.h | 10 +-
include/asm-x86/kvm_host.h | 8 +-
include/asm-x86/mach-bigsmp/mach_apic.h | 4 +-
include/asm-x86/mach-default/mach_apic.h | 4 +-
include/asm-x86/mach-es7000/mach_apic.h | 4 +-
include/asm-x86/mach-generic/mach_mpspec.h | 2 +
include/asm-x86/mach-summit/mach_apic.h | 4 +-
include/asm-x86/mach-visws/entry_arch.h | 5 -
include/asm-x86/mach-visws/mach_apic.h | 1 -
include/asm-x86/mach-visws/mach_apicdef.h | 1 -
include/asm-x86/mach-visws/setup_arch.h | 1 -
include/asm-x86/mach-visws/smpboot_hooks.h | 1 -
include/asm-x86/paravirt.h | 75 +++-
include/asm-x86/percpu.h | 26 +
include/asm-x86/pgtable.h | 18 +
include/asm-x86/pgtable_32.h | 15 -
include/asm-x86/pgtable_64.h | 2 +
include/asm-x86/processor.h | 2 -
include/asm-x86/ptrace-abi.h | 6 +-
include/asm-x86/segment.h | 9 +
include/asm-x86/setup.h | 30 +-
include/asm-x86/signal.h | 4 +-
include/asm-x86/smp.h | 2 +
include/asm-x86/spinlock.h | 118 ++++-
include/asm-x86/spinlock_types.h | 2 +-
include/asm-x86/swiotlb.h | 6 +-
include/asm-x86/thread_info.h | 21 +-
include/asm-x86/traps.h | 66 +++
include/asm-x86/uv/bios.h | 68 +++
include/asm-x86/vdso.h | 8 +
include/asm-x86/xen/events.h | 1 +
include/asm-x86/xen/hypercall.h | 263 ++++++++----
include/asm-x86/xen/interface.h | 139 ++----
include/asm-x86/xen/interface_32.h | 97 ++++
include/asm-x86/xen/interface_64.h | 159 +++++++
include/asm-x86/xen/page.h | 6 +-
include/linux/debugfs.h | 2 +
include/xen/events.h | 7 +
include/xen/hvc-console.h | 7 +-
include/xen/interface/callback.h | 6 +-
include/xen/xen-ops.h | 3 +
kernel/power/Kconfig | 2 +-
152 files changed, 4292 insertions(+), 1753 deletions(-)
create mode 100644 arch/x86/kernel/bios_uv.c
delete mode 100644 arch/x86/kernel/smpcommon_32.c
create mode 100644 arch/x86/mm/memtest.c
rename arch/x86/pci/{numa.c => numaq_32.c} (97%)
rename arch/x86/xen/{xen-asm.S => xen-asm_32.S} (100%)
create mode 100644 arch/x86/xen/xen-asm_64.S
delete mode 100644 include/asm-x86/mach-visws/entry_arch.h
delete mode 100644 include/asm-x86/mach-visws/mach_apic.h
delete mode 100644 include/asm-x86/mach-visws/mach_apicdef.h
delete mode 100644 include/asm-x86/mach-visws/setup_arch.h
delete mode 100644 include/asm-x86/mach-visws/smpboot_hooks.h
create mode 100644 include/asm-x86/traps.h
create mode 100644 include/asm-x86/uv/bios.h
create mode 100644 include/asm-x86/xen/interface_32.h
create mode 100644 include/asm-x86/xen/interface_64.h
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [git pull] x86 updates for v2.6.27, phase #2 2008-07-21 15:04 [git pull] x86 updates for v2.6.27, phase #2 Ingo Molnar @ 2008-07-21 15:32 ` Ingo Molnar 2008-07-21 17:42 ` Linus Torvalds 0 siblings, 1 reply; 4+ messages in thread From: Ingo Molnar @ 2008-07-21 15:32 UTC (permalink / raw) To: Linus Torvalds Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Andrew Morton hm, i just noticed this ugly build warning: fs/partitions/efi.c:102:1: warning: "Dprintk" redefined In file included from include/asm/smp.h:13, from include/linux/smp.h:28, from include/linux/topology.h:33, from include/linux/mmzone.h:683, from include/linux/gfp.h:4, from include/linux/mm.h:8, from include/linux/pagemap.h:7, from fs/partitions/check.h:1, from fs/partitions/efi.c:95: include/asm/apic.h:15:1: warning: this is the location of the previous definition i'll fix it ... Dprintk in apic.h is historic and ugly. Should i redo the tree and the pull request? Ingo ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git pull] x86 updates for v2.6.27, phase #2 2008-07-21 15:32 ` Ingo Molnar @ 2008-07-21 17:42 ` Linus Torvalds 2008-07-21 19:54 ` Ingo Molnar 0 siblings, 1 reply; 4+ messages in thread From: Linus Torvalds @ 2008-07-21 17:42 UTC (permalink / raw) To: Ingo Molnar; +Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Andrew Morton On Mon, 21 Jul 2008, Ingo Molnar wrote: > > i'll fix it ... Dprintk in apic.h is historic and ugly. Should i redo > the tree and the pull request? I already pulled it, so please just send a (tested) patch. But it would have ben _so_ much better to have noticed this before-the-fact. Linus ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [git pull] x86 updates for v2.6.27, phase #2 2008-07-21 17:42 ` Linus Torvalds @ 2008-07-21 19:54 ` Ingo Molnar 0 siblings, 0 replies; 4+ messages in thread From: Ingo Molnar @ 2008-07-21 19:54 UTC (permalink / raw) To: Linus Torvalds Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Andrew Morton * Linus Torvalds <torvalds@linux-foundation.org> wrote: > On Mon, 21 Jul 2008, Ingo Molnar wrote: > > > > i'll fix it ... Dprintk in apic.h is historic and ugly. Should i > > redo the tree and the pull request? > > I already pulled it, so please just send a (tested) patch. But it > would have ben _so_ much better to have noticed this before-the-fact. yeah, sorry about that. Thomas has fixed up that old mess and i've tested it, please pull the fix from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus Thanks, Ingo ------------------> Thomas Gleixner (1): x86: convert Dprintk to pr_debug arch/x86/kernel/acpi/boot.c | 6 +- arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +- arch/x86/kernel/setup_percpu.c | 6 +- arch/x86/kernel/smpboot.c | 52 +++++++++++++------------- arch/x86/mm/numa_64.c | 4 -- arch/x86/pci/early.c | 16 +++---- include/asm-x86/apic.h | 2 - include/asm-x86/mach-default/smpboot_hooks.h | 6 +- 8 files changed, 44 insertions(+), 52 deletions(-) diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index f489d7a..fa88a1d 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1021,7 +1021,7 @@ void __init mp_config_acpi_legacy_irqs(void) mp_bus_id_to_type[MP_ISA_BUS] = MP_BUS_ISA; #endif set_bit(MP_ISA_BUS, mp_bus_not_pci); - Dprintk("Bus #%d is ISA\n", MP_ISA_BUS); + pr_debug("Bus #%d is ISA\n", MP_ISA_BUS); #ifdef CONFIG_X86_ES7000 /* @@ -1127,8 +1127,8 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) return gsi; } if (test_bit(ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed)) { - Dprintk(KERN_DEBUG "Pin %d-%d already programmed\n", - mp_ioapic_routing[ioapic].apic_id, ioapic_pin); + pr_debug(KERN_DEBUG "Pin %d-%d already programmed\n", + mp_ioapic_routing[ioapic].apic_id, ioapic_pin); #ifdef CONFIG_X86_32 return (gsi < IRQ_COMPRESSION_START ? gsi : gsi_to_irq[gsi]); #else diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c index 6d4bdc0..de7439f 100644 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c @@ -250,7 +250,7 @@ static void write_watchdog_counter(unsigned int perfctr_msr, do_div(count, nmi_hz); if(descr) - Dprintk("setting %s to -0x%08Lx\n", descr, count); + pr_debug("setting %s to -0x%08Lx\n", descr, count); wrmsrl(perfctr_msr, 0 - count); } @@ -261,7 +261,7 @@ static void write_watchdog_counter32(unsigned int perfctr_msr, do_div(count, nmi_hz); if(descr) - Dprintk("setting %s to -0x%08Lx\n", descr, count); + pr_debug("setting %s to -0x%08Lx\n", descr, count); wrmsr(perfctr_msr, (u32)(-count), 0); } diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index cac6843..f7745f9 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -227,8 +227,8 @@ static void __init setup_node_to_cpumask_map(void) /* allocate the map */ map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t)); - Dprintk(KERN_DEBUG "Node to cpumask map at %p for %d nodes\n", - map, nr_node_ids); + pr_debug(KERN_DEBUG "Node to cpumask map at %p for %d nodes\n", + map, nr_node_ids); /* node_to_cpumask() will now work */ node_to_cpumask_map = map; @@ -248,7 +248,7 @@ void __cpuinit numa_set_node(int cpu, int node) per_cpu(x86_cpu_to_node_map, cpu) = node; else - Dprintk(KERN_INFO "Setting node for non-present cpu %d\n", cpu); + pr_debug("Setting node for non-present cpu %d\n", cpu); } void __cpuinit numa_clear_node(int cpu) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 2764019..4b53a64 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -216,7 +216,7 @@ static void __cpuinit smp_callin(void) panic("%s: phys CPU#%d, CPU#%d already present??\n", __func__, phys_id, cpuid); } - Dprintk("CPU#%d (phys ID: %d) waiting for CALLOUT\n", cpuid, phys_id); + pr_debug("CPU#%d (phys ID: %d) waiting for CALLOUT\n", cpuid, phys_id); /* * STARTUP IPIs are fragile beasts as they might sometimes @@ -251,7 +251,7 @@ static void __cpuinit smp_callin(void) * boards) */ - Dprintk("CALLIN, before setup_local_APIC().\n"); + pr_debug("CALLIN, before setup_local_APIC().\n"); smp_callin_clear_local_apic(); setup_local_APIC(); end_local_APIC_setup(); @@ -266,7 +266,7 @@ static void __cpuinit smp_callin(void) local_irq_enable(); calibrate_delay(); local_irq_disable(); - Dprintk("Stack at about %p\n", &cpuid); + pr_debug("Stack at about %p\n", &cpuid); /* * Save our processor parameters @@ -513,7 +513,7 @@ static void impress_friends(void) /* * Allow the user to impress friends. */ - Dprintk("Before bogomips.\n"); + pr_debug("Before bogomips.\n"); for_each_possible_cpu(cpu) if (cpu_isset(cpu, cpu_callout_map)) bogosum += cpu_data(cpu).loops_per_jiffy; @@ -523,7 +523,7 @@ static void impress_friends(void) bogosum/(500000/HZ), (bogosum/(5000/HZ))%100); - Dprintk("Before bogocount - setting activated=1.\n"); + pr_debug("Before bogocount - setting activated=1.\n"); } static inline void __inquire_remote_apic(int apicid) @@ -585,7 +585,7 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) /* Kick the second */ apic_write(APIC_ICR, APIC_DM_NMI | APIC_DEST_LOGICAL); - Dprintk("Waiting for send to finish...\n"); + pr_debug("Waiting for send to finish...\n"); send_status = safe_apic_wait_icr_idle(); /* @@ -596,7 +596,7 @@ wakeup_secondary_cpu(int logical_apicid, unsigned long start_eip) if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ apic_write(APIC_ESR, 0); accept_status = (apic_read(APIC_ESR) & 0xEF); - Dprintk("NMI sent.\n"); + pr_debug("NMI sent.\n"); if (send_status) printk(KERN_ERR "APIC never delivered???\n"); @@ -631,7 +631,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) apic_read(APIC_ESR); } - Dprintk("Asserting INIT.\n"); + pr_debug("Asserting INIT.\n"); /* * Turn INIT on target chip @@ -644,12 +644,12 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT); - Dprintk("Waiting for send to finish...\n"); + pr_debug("Waiting for send to finish...\n"); send_status = safe_apic_wait_icr_idle(); mdelay(10); - Dprintk("Deasserting INIT.\n"); + pr_debug("Deasserting INIT.\n"); /* Target chip */ apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid)); @@ -657,7 +657,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) /* Send IPI */ apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT); - Dprintk("Waiting for send to finish...\n"); + pr_debug("Waiting for send to finish...\n"); send_status = safe_apic_wait_icr_idle(); mb(); @@ -684,14 +684,14 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) /* * Run STARTUP IPI loop. */ - Dprintk("#startup loops: %d.\n", num_starts); + pr_debug("#startup loops: %d.\n", num_starts); for (j = 1; j <= num_starts; j++) { - Dprintk("Sending STARTUP #%d.\n", j); + pr_debug("Sending STARTUP #%d.\n", j); if (maxlvt > 3) /* Due to the Pentium erratum 3AP. */ apic_write(APIC_ESR, 0); apic_read(APIC_ESR); - Dprintk("After apic_write.\n"); + pr_debug("After apic_write.\n"); /* * STARTUP IPI @@ -709,9 +709,9 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) */ udelay(300); - Dprintk("Startup point 1.\n"); + pr_debug("Startup point 1.\n"); - Dprintk("Waiting for send to finish...\n"); + pr_debug("Waiting for send to finish...\n"); send_status = safe_apic_wait_icr_idle(); /* @@ -724,7 +724,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip) if (send_status || accept_status) break; } - Dprintk("After Startup.\n"); + pr_debug("After Startup.\n"); if (send_status) printk(KERN_ERR "APIC never delivered???\n"); @@ -875,7 +875,7 @@ do_rest: if (get_uv_system_type() != UV_NON_UNIQUE_APIC) { - Dprintk("Setting warm reset code and vector.\n"); + pr_debug("Setting warm reset code and vector.\n"); store_NMI_vector(&nmi_high, &nmi_low); @@ -896,9 +896,9 @@ do_rest: /* * allow APs to start initializing. */ - Dprintk("Before Callout %d.\n", cpu); + pr_debug("Before Callout %d.\n", cpu); cpu_set(cpu, cpu_callout_map); - Dprintk("After Callout %d.\n", cpu); + pr_debug("After Callout %d.\n", cpu); /* * Wait 5s total for a response @@ -911,10 +911,10 @@ do_rest: if (cpu_isset(cpu, cpu_callin_map)) { /* number CPUs logically, starting from 1 (BSP is 0) */ - Dprintk("OK.\n"); + pr_debug("OK.\n"); printk(KERN_INFO "CPU%d: ", cpu); print_cpu_info(&cpu_data(cpu)); - Dprintk("CPU has booted.\n"); + pr_debug("CPU has booted.\n"); } else { boot_error = 1; if (*((volatile unsigned char *)trampoline_base) @@ -959,7 +959,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) WARN_ON(irqs_disabled()); - Dprintk("++++++++++++++++++++=_---CPU UP %u\n", cpu); + pr_debug("++++++++++++++++++++=_---CPU UP %u\n", cpu); if (apicid == BAD_APICID || apicid == boot_cpu_physical_apicid || !physid_isset(apicid, phys_cpu_present_map)) { @@ -971,7 +971,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) * Already booted CPU? */ if (cpu_isset(cpu, cpu_callin_map)) { - Dprintk("do_boot_cpu %d Already started\n", cpu); + pr_debug("do_boot_cpu %d Already started\n", cpu); return -ENOSYS; } @@ -998,7 +998,7 @@ int __cpuinit native_cpu_up(unsigned int cpu) err = do_boot_cpu(apicid, cpu); #endif if (err) { - Dprintk("do_boot_cpu failed %d\n", err); + pr_debug("do_boot_cpu failed %d\n", err); return -EIO; } @@ -1202,7 +1202,7 @@ void __init native_smp_prepare_boot_cpu(void) void __init native_smp_cpus_done(unsigned int max_cpus) { - Dprintk("Boot done.\n"); + pr_debug("Boot done.\n"); impress_friends(); smp_checks(); diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index b432d57..9782f42 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -20,10 +20,6 @@ #include <asm/acpi.h> #include <asm/k8.h> -#ifndef Dprintk -#define Dprintk(x...) -#endif - struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; EXPORT_SYMBOL(node_data); diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c index 858dbe3..86631cc 100644 --- a/arch/x86/pci/early.c +++ b/arch/x86/pci/early.c @@ -7,15 +7,13 @@ /* Direct PCI access. This is used for PCI accesses in early boot before the PCI subsystem works. */ -#define PDprintk(x...) - u32 read_pci_config(u8 bus, u8 slot, u8 func, u8 offset) { u32 v; outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); v = inl(0xcfc); if (v != 0xffffffff) - PDprintk("%x reading 4 from %x: %x\n", slot, offset, v); + pr_debug("%x reading 4 from %x: %x\n", slot, offset, v); return v; } @@ -24,7 +22,7 @@ u8 read_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset) u8 v; outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); v = inb(0xcfc + (offset&3)); - PDprintk("%x reading 1 from %x: %x\n", slot, offset, v); + pr_debug("%x reading 1 from %x: %x\n", slot, offset, v); return v; } @@ -33,28 +31,28 @@ u16 read_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset) u16 v; outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); v = inw(0xcfc + (offset&2)); - PDprintk("%x reading 2 from %x: %x\n", slot, offset, v); + pr_debug("%x reading 2 from %x: %x\n", slot, offset, v); return v; } void write_pci_config(u8 bus, u8 slot, u8 func, u8 offset, u32 val) { - PDprintk("%x writing to %x: %x\n", slot, offset, val); + pr_debug("%x writing to %x: %x\n", slot, offset, val); outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); outl(val, 0xcfc); } void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val) { - PDprintk("%x writing to %x: %x\n", slot, offset, val); + pr_debug("%x writing to %x: %x\n", slot, offset, val); outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); outb(val, 0xcfc + (offset&3)); } void write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val) { - PDprintk("%x writing to %x: %x\n", slot, offset, val); + pr_debug("%x writing to %x: %x\n", slot, offset, val); outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8); outw(val, 0xcfc + (offset&2)); } @@ -71,7 +69,7 @@ void early_dump_pci_device(u8 bus, u8 slot, u8 func) int j; u32 val; - printk("PCI: %02x:%02x:%02x", bus, slot, func); + printk(KERN_INFO "PCI: %02x:%02x:%02x", bus, slot, func); for (i = 0; i < 256; i += 4) { if (!(i & 0x0f)) diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index b96460a..133c998 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h @@ -12,8 +12,6 @@ #define ARCH_APICTIMER_STOPS_ON_C3 1 -#define Dprintk printk - /* * Debugging macros */ diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h index 56d001b..dbab36d 100644 --- a/include/asm-x86/mach-default/smpboot_hooks.h +++ b/include/asm-x86/mach-default/smpboot_hooks.h @@ -12,11 +12,11 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) { CMOS_WRITE(0xa, 0xf); local_flush_tlb(); - Dprintk("1.\n"); + pr_debug("1.\n"); *((volatile unsigned short *) TRAMPOLINE_HIGH) = start_eip >> 4; - Dprintk("2.\n"); + pr_debug("2.\n"); *((volatile unsigned short *) TRAMPOLINE_LOW) = start_eip & 0xf; - Dprintk("3.\n"); + pr_debug("3.\n"); } static inline void smpboot_restore_warm_reset_vector(void) ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-07-21 19:54 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2008-07-21 15:04 [git pull] x86 updates for v2.6.27, phase #2 Ingo Molnar 2008-07-21 15:32 ` Ingo Molnar 2008-07-21 17:42 ` Linus Torvalds 2008-07-21 19:54 ` Ingo Molnar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®