The patch titled
use-generic-bug-for-powerpc-fix-2
has been removed from the -mm tree. Its filename is
use-generic-bug-for-powerpc-fix-2.patch
This patch was dropped because an updated version was merged
------------------------------------------------------
Subject: use-generic-bug-for-powerpc-fix-2
From: Andrew Morton <akpm@xxxxxxxx>
Prevent infinite looping when handling a WARN() (I think)
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Cc: Hugh Dickens <hugh@xxxxxxxxxxx>
Cc: Michael Ellerman <michael@xxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/kernel/traps.c | 2 +-
include/linux/bug.h | 11 ++++++++---
lib/bug.c | 18 +++++++++---------
3 files changed, 18 insertions(+), 13 deletions(-)
diff -puN arch/powerpc/kernel/traps.c~use-generic-bug-for-powerpc-fix-2 arch/powerpc/kernel/traps.c
--- a/arch/powerpc/kernel/traps.c~use-generic-bug-for-powerpc-fix-2
+++ a/arch/powerpc/kernel/traps.c
@@ -779,7 +779,7 @@ void __kprobes program_check_exception(s
return;
if (!(regs->msr & MSR_PR) && /* not user-mode */
- report_bug(regs->nip)) {
+ report_bug(regs->nip) == BUG_TRAP_TYPE_WARN) {
regs->nip += 4;
return;
}
diff -puN include/linux/bug.h~use-generic-bug-for-powerpc-fix-2 include/linux/bug.h
--- a/include/linux/bug.h~use-generic-bug-for-powerpc-fix-2
+++ a/include/linux/bug.h
@@ -6,12 +6,17 @@
#ifdef CONFIG_GENERIC_BUG
#include <linux/module.h>
+enum bug_trap_type {
+ BUG_TRAP_TYPE_NONE = 0,
+ BUG_TRAP_TYPE_WARN = 1,
+ BUG_TRAP_TYPE_BUG = 2,
+};
+
const struct bug_entry *find_bug(unsigned long bugaddr);
-int report_bug(unsigned long bug_addr);
+enum bug_trap_type report_bug(unsigned long bug_addr);
-int module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *,
- struct module *);
+int module_bug_finalize(const Elf_Ehdr *, const Elf_Shdr *, struct module *);
void module_bug_cleanup(struct module *);
/* These are defined by the architecture */
diff -puN lib/bug.c~use-generic-bug-for-powerpc-fix-2 lib/bug.c
--- a/lib/bug.c~use-generic-bug-for-powerpc-fix-2
+++ a/lib/bug.c
@@ -75,18 +75,18 @@ const struct bug_entry *find_bug(unsigne
return module_find_bug(bugaddr);
}
-int report_bug(unsigned long bugaddr)
+enum bug_trap_type report_bug(unsigned long bugaddr)
{
const struct bug_entry *bug;
const char *file, *function;
unsigned line;
if (!is_valid_bugaddr(bugaddr))
- return 0;
+ return BUG_TRAP_TYPE_NONE;
bug = find_bug(bugaddr);
if (!bug)
- return 0;
+ return BUG_TRAP_TYPE_NONE;
printk(KERN_EMERG "------------[ cut here ]------------\n");
@@ -100,19 +100,19 @@ int report_bug(unsigned long bugaddr)
printk(KERN_ERR "Badness in %s at %s:%u\n",
function, file, line);
else
- printk(KERN_ERR "Badness at %p [verbose debug info unavailable]\n",
- (void *)bugaddr);
+ printk(KERN_ERR "Badness at %p [verbose debug info "
+ "unavailable]\n", (void *)bugaddr);
dump_stack();
- return 1;
+ return BUG_TRAP_TYPE_WARN;
}
if (file)
printk(KERN_CRIT "kernel BUG in %s at %s:%u!\n",
function, file, line);
else
- printk(KERN_EMERG "Kernel BUG at %p [verbose debug info unavailable]\n",
- (void *)bugaddr);
+ printk(KERN_EMERG "Kernel BUG at %p [verbose debug info "
+ "unavailable]\n", (void *)bugaddr);
- return 0;
+ return BUG_TRAP_TYPE_BUG;
}
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
revert-insert-ioapics-and-local-apic-into-resource-map.patch
pidh-cleanup.patch
ipmi-allow-user-to-override-the-kernel-ipmi-daemon-enable.patch
sched-remove-unnecessary-sched-group-allocations.patch
isdn-debug-build-fix.patch
isdn-more-pr_debug-fixes.patch
git-acpi.patch
acpi-preserve-correct-battery-state-through-suspend-resume-cycles-tidy.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
git-cifs-fixup.patch
git-dvb.patch
git-geode-fixup.patch
git-gfs2.patch
revert-input-make-input_openclose_device-more-robust.patch
hdrcheck-permission-fix.patch
git-libata-all.patch
libata-return-sense-data-in-hdio_drive_cmd-ioctl-tidy.patch
forcedeth-power-management-support-tidy.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
git-parisc.patch
git-parisc-powerpc-fix.patch
git-pcmcia-fixup.patch
git-powerpc-wrapper-dont-require-execute-permissions.patch
git-serial.patch
git-serial-fixup.patch
serial-fix-uart_bug_txen-test.patch
revert-gregkh-pci-altix-rom-shadowing.patch
revert-gregkh-pci-altix-sn-acpi-hotplug-support.patch
revert-gregkh-pci-altix-add-initial-acpi-io-support.patch
pci-optionally-sort-device-lists-breadth-first-tweaks.patch
pci-optionally-sort-device-lists-breadth-first-force-on.patch
git-scsi-misc.patch
git-scsi-target-fixup.patch
git-scsi-target-vs-git-block.patch
xpad-dance-pad-support-tidy.patch
git-watchdog.patch
git-watchdog-fixup.patch
fix-x86_64-mm-kernel-stack-termination.patch
x86_64-dump_trace-atomicity-fix.patch
spinlock-debug-all-cpu-backtrace.patch
spinlock-debug-all-cpu-backtrace-fix.patch
spinlock-debug-all-cpu-backtrace-fix-2.patch
spinlock-debug-all-cpu-backtrace-fix-3.patch
xfs-rename-uio_read.patch
enforce-proper-tlb-flush-in-unmap_hugepage_range-tidy.patch
get-rid-of-zone_table.patch
kmemdup-introduce-vs-slab-clean-up-leak-tracking-ifdefs-a-little-bit.patch
slab-reduce-numa-text-size-tidy.patch
swap-token-new-scheme-to-preempt-token-tidy.patch
radix-tree-rcu-lockless-readside.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
swsusp-add-resume_offset-command-line-parameter-rev-2-fix.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
add-address_space_operationsbatch_write-fix.patch
add-config_headers_check-option-to-automatically-run-make-headers_check-nobble.patch
use-generic-bug-for-powerpc-fix-2.patch
bug-test-1.patch
mmc-driver-for-ti-flashmedia-card-reader-source.patch
fs-cache-make-kafs-use-fs-cache-fix.patch
fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch
nfs-use-local-caching-12-fix.patch
swap_prefetch-vs-zoned-counters.patch
ecryptfs-mmap-operations.patch
ecryptfs-alpha-build-fix.patch
ecryptfs-more-elegant-aes-key-size-manipulation.patch
ecryptfs-get_sb_dev-fix.patch
make-kmem_cache_destroy-return-void-ecryptfs.patch
ecryptfs-versioning-fixes-tidy.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch
make-kmem_cache_destroy-return-void-reiser4.patch
reiser4-hardirq-include-fix.patch
reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch
reiser4-get_sb_dev-fix.patch
reiser4-vs-zoned-allocator.patch
reiser4-rename-generic_sounding_globalspatch-fix.patch
hpt3xx-rework-rate-filtering-tidy.patch
fbdev-riva-warning-fix.patch
genirq-convert-the-i386-architecture-to-irq-chips.patch
genirq-x86_64-irq-reenable-migrating-irqs-to-other-cpus.patch
genirq-msi-simplify-msi-enable-and-disable.patch
genirq-ia64-irq-dynamic-irq-support.patch
genirq-msi-only-build-msi-apicc-on-ia64-fix.patch
genirq-i386-irq-remove-the-msi-assumption-that-irq-==-vector.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-fix.patch
genirq-x86_64-irq-make-vector_irq-per-cpu-warning-fix.patch
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
srcu-report-out-of-memory-errors-fixlet.patch
gtod-persistent-clock-support-i386-update-fix.patch
hrtimers-state-tracking-fix.patch
clockevents-drivers-for-i386-fix.patch
debugging-feature-timer-stats-fix.patch
kevent-core-files-fix.patch
kevent-core-files-s390-hack.patch
kevent-socket-notifications-fix-2.patch
kevent-socket-notifications-fix-4.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
restore-rogue-readahead-printk.patch
put_bh-debug.patch
acpi_format_exception-debug.patch
jmicron-warning-fix.patch
squash-ipc-warnings.patch
squash-transmeta-warnings.patch
squash-tcp-warnings.patch
squash-udf-warnings.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
