The patch titled
provide-better-printk-support-for-smp-machines tidy
has been added to the -mm tree. Its filename is
provide-better-printk-support-for-smp-machines-tidy.patch
Patches currently in -mm which might be from [EMAIL PROTECTED] are
name_to_dev_t-warning-fix.patch
git-netdev-janitor-fixup.patch
wireless-device-attr-fixes.patch
wireless-device-attr-fixes-2.patch
ipw2100-old-gcc-fix.patch
ieee80211_module-build-fixes.patch
ieee80211_tx-build-fix.patch
ieee80211_rx-build-fix.patch
ieee80211_crypt-build-fix.patch
ieee80211_crypt_ccmp-build-fix.patch
ieee80211_crypt_wep-build-fix.patch
ieee80211_crypt_tkip-build-fix.patch
revert-gregkh-pci-pci-assign-unassigned-resources.patch
dpt_i2o-warning-fix.patch
aic79xx-ahd_linux_dev_reset-cleanup.patch
bk-watchdog.patch
zatm-kfree-fix.patch
e1000-printk-warning-fix-2.patch
net-add-driver-for-the-nic-on-cell-blades-kconfig-fix.patch
ipw2200-build-fix.patch
x86_64-div-by-zero-fix.patch
alpha-pgprot_uncached-comment.patch
page_uptodate-locking-scalability-fix.patch
yealink-updates.patch
pselect-ppoll-system-calls-tidy.patch
pselect-ppoll-system-calls-sigset_t-fix-2.patch
pselect-ppoll-system-calls-sigset_t-fix-3.patch
xip-empty_zero_page-build-fix.patch
reset-real_timer-target-on-exec-leader-change-coding-style-fixes.patch
provide-better-printk-support-for-smp-machines-tidy.patch
smsc-ircc2-pm-cleanup-do-not-close-device-when-suspending-fixes.patch
connector-exit-notifier-fix.patch
connector-add-a-fork-connector-use-after-free-fix.patch
jbd-split-checkpoint-lists-tweaks.patch
revert-fix-broken-kmalloc_node-in-rc1-rc2.patch
nr_blockdev_pages-in_interrupt-warning.patch
sysfs-crash-debugging.patch
asfs-filesystem-driver-fixes.patch
reiser4-swsusp-build-fix.patch
reiser4-printk-warning-fix.patch
reiser4-mm-remove-pg_highmem-fix.patch
v9fs-debug-and-support-routines-fix.patch
timer-initialization-cleanup-define_timer-pluto-fix.patch
From: Andrew Morton <[EMAIL PROTECTED]>
If we're inside preempt_disable() then there is no need for
raw_smp_processor_id().
Cc: David Howells <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
kernel/printk.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -puN kernel/printk.c~provide-better-printk-support-for-smp-machines-tidy
kernel/printk.c
--- 25/kernel/printk.c~provide-better-printk-support-for-smp-machines-tidy
Fri Jul 8 16:29:39 2005
+++ 25-akpm/kernel/printk.c Fri Jul 8 16:29:39 2005
@@ -526,14 +526,14 @@ asmlinkage int vprintk(const char *fmt,
static int log_level_unknown = 1;
preempt_disable();
- if (unlikely(oops_in_progress) && printk_cpu == raw_smp_processor_id())
+ if (unlikely(oops_in_progress) && printk_cpu == smp_processor_id())
/* If a crash is occurring during printk() on this CPU,
* make sure we can't deadlock */
zap_locks();
/* This stops the holder of console_sem just where we want him */
spin_lock_irqsave(&logbuf_lock, flags);
- printk_cpu = raw_smp_processor_id();
+ printk_cpu = smp_processor_id();
/* Emit the output into the temporary buffer */
printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
@@ -595,7 +595,7 @@ asmlinkage int vprintk(const char *fmt,
log_level_unknown = 1;
}
- if (!cpu_online(raw_smp_processor_id())) {
+ if (!cpu_online(smp_processor_id())) {
/*
* Some console drivers may assume that per-cpu resources have
* been allocated. So don't allow them to be called by this
_
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
