The patch titled
revert x86_64-mm-dwarf2-for-inline-asm
has been added to the -mm tree. Its filename is
revert-x86_64-mm-dwarf2-for-inline-asm.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: revert x86_64-mm-dwarf2-for-inline-asm
From: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/Makefile | 2 -
include/asm-x86_64/dwarf2-disabled.i | 26 --------------
include/asm-x86_64/dwarf2-enabled.i | 39 ---------------------
include/asm-x86_64/dwarf2.h | 46 +++++++++++++++++--------
4 files changed, 33 insertions(+), 80 deletions(-)
diff -puN arch/x86_64/Makefile~revert-x86_64-mm-dwarf2-for-inline-asm arch/x86_64/Makefile
--- a/arch/x86_64/Makefile~revert-x86_64-mm-dwarf2-for-inline-asm
+++ a/arch/x86_64/Makefile
@@ -59,7 +59,7 @@ cflags-y += $(call as-instr,.cfi_startpr
CFLAGS += $(cflags-y)
CFLAGS_KERNEL += $(cflags-kernel-y)
-AFLAGS += -m64 -Wa,-I,$(srctree)/include
+AFLAGS += -m64
head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
diff -puN include/asm-x86_64/dwarf2-disabled.i~revert-x86_64-mm-dwarf2-for-inline-asm /dev/null
--- a/include/asm-x86_64/dwarf2-disabled.i
+++ /dev/null
@@ -1,26 +0,0 @@
- .macro CFI_STARTPROC x:vararg
- .endm
- .macro CFI_ENDPROC
- .endm
- .macro CFI_DEF_CFA a:vararg
- .endm
- .macro CFI_DEF_CFA_REGISTER a:vararg
- .endm
- .macro CFI_DEF_CFA_OFFSET a:vararg
- .endm
- .macro CFI_ADJUST_CFA_OFFSET a:vararg
- .endm
- .macro CFI_OFFSET a:vararg
- .endm
- .macro CFI_REL_OFFSET a:vararg
- .endm
- .macro CFI_REGISTER a:vararg
- .endm
- .macro CFI_RESTORE a:vararg
- .endm
- .macro CFI_REMEMBER_STATE
- .endm
- .macro CFI_RESTORE_STATE
- .endm
- .macro CFI_UNDEFINED x:vararg
- .endm
diff -puN include/asm-x86_64/dwarf2-enabled.i~revert-x86_64-mm-dwarf2-for-inline-asm /dev/null
--- a/include/asm-x86_64/dwarf2-enabled.i
+++ /dev/null
@@ -1,39 +0,0 @@
- .macro CFI_STARTPROC x:vararg
- .cfi_startproc \x
- .endm
- .macro CFI_ENDPROC
- .cfi_endproc
- .endm
- .macro CFI_DEF_CFA a:vararg
- .cfi_def_cfa \a
- .endm
- .macro CFI_DEF_CFA_REGISTER a:vararg
- .cfi_def_cfa_register \a
- .endm
- .macro CFI_DEF_CFA_OFFSET a:vararg
- .cfi_def_cfa_offset \a
- .endm
- .macro CFI_ADJUST_CFA_OFFSET a:vararg
- .cfi_adjust_cfa_offset \a
- .endm
- .macro CFI_OFFSET a:vararg
- .cfi_offset \a
- .endm
- .macro CFI_REL_OFFSET a:vararg
- .cfi_rel_offset \a
- .endm
- .macro CFI_REGISTER a:vararg
- .cfi_register \a
- .endm
- .macro CFI_RESTORE a:vararg
- .cfi_restore \a
- .endm
- .macro CFI_REMEMBER_STATE
- .cfi_remember_state
- .endm
- .macro CFI_RESTORE_STATE
- .cfi_restore_state
- .endm
- .macro CFI_UNDEFINED x:vararg
- .cfi_undefined \x
- .endm
diff -puN include/asm-x86_64/dwarf2.h~revert-x86_64-mm-dwarf2-for-inline-asm include/asm-x86_64/dwarf2.h
--- a/include/asm-x86_64/dwarf2.h~revert-x86_64-mm-dwarf2-for-inline-asm
+++ a/include/asm-x86_64/dwarf2.h
@@ -1,7 +1,10 @@
#ifndef _DWARF2_H
#define _DWARF2_H 1
-#include <linux/config.h>
+
+#ifndef __ASSEMBLY__
+#warning "asm/dwarf2.h should be only included in pure assembly files"
+#endif
/*
Macros for dwarf2 CFI unwind table entries.
@@ -11,23 +14,38 @@
*/
-#ifndef __ASSEMBLY__
+#ifdef CONFIG_UNWIND_INFO
-/* Include the dwarf2 macros in a way that they are usable from inline assembly */
+#define CFI_STARTPROC .cfi_startproc
+#define CFI_ENDPROC .cfi_endproc
+#define CFI_DEF_CFA .cfi_def_cfa
+#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register
+#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
+#define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset
+#define CFI_OFFSET .cfi_offset
+#define CFI_REL_OFFSET .cfi_rel_offset
+#define CFI_REGISTER .cfi_register
+#define CFI_RESTORE .cfi_restore
+#define CFI_REMEMBER_STATE .cfi_remember_state
+#define CFI_RESTORE_STATE .cfi_restore_state
+#define CFI_UNDEFINED .cfi_undefined
-#ifdef CONFIG_AS_CFI
-asm("\t.include \"asm-x86_64/dwarf2-enabled.i\"");
#else
-asm("\t.include \"asm-x86_64/dwarf2-disabled.i\"");
-#endif
-#else
-
-#ifdef CONFIG_AS_CFI
- .include "asm-x86_64/dwarf2-enabled.i"
-#else
- .include "asm-x86_64/dwarf2-disabled.i"
-#endif
+/* use assembler line comment character # to ignore the arguments. */
+#define CFI_STARTPROC #
+#define CFI_ENDPROC #
+#define CFI_DEF_CFA #
+#define CFI_DEF_CFA_REGISTER #
+#define CFI_DEF_CFA_OFFSET #
+#define CFI_ADJUST_CFA_OFFSET #
+#define CFI_OFFSET #
+#define CFI_REL_OFFSET #
+#define CFI_REGISTER #
+#define CFI_RESTORE #
+#define CFI_REMEMBER_STATE #
+#define CFI_RESTORE_STATE #
+#define CFI_UNDEFINED #
#endif
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
ext3-avoid-triggering-ext3_error-on-bad-nfs-file-handle-fix.patch
disable-debugging-version-of-write_lock.patch
acpi-asus-s3-resume-fix.patch
sony_apci-resume.patch
kauditd_thread-warning-fix.patch
revert-gregkh-driver-class_device_rename-remove.patch
revert-gregkh-driver-network-class_device-to-device.patch
add-__must_check-to-device-management-code.patch
add-config_enable_must_check.patch
v4l-dev2-handle-__must_check.patch
drivers-base-check-errors.patch
drivers-base-check-errors-fix.patch
sysfs-add-proper-sysfs_init-prototype.patch
scsi-device_reprobe-can-fail.patch
git-dvb-fixup.patch
dvb-core-needs-i2c.patch
git-geode-fixup.patch
git-gfs2.patch
git-ia64.patch
git-ieee1394-fixup.patch
git-input.patch
logips2pp-fix-mx300-button-layout-fix.patch
git-klibc.patch
git-hdrcleanup-vs-git-klibc-on-ia64.patch
git-hdrcleanup-vs-git-klibc-on-ia64-2.patch
git-libata-all.patch
sata-is-bust-on-s390.patch
rework-legacy-handling-to-remove-much-of-the-cruft-fix.patch
82596-section-fixes.patch
ac3200-section-fixes.patch
cops-section-fix.patch
cs89x0-section-fix.patch
at1700-section-fix.patch
e2100-section-fix.patch
eepro-section-fix.patch
eexpress-section-fix.patch
es3210-section-fix.patch
eth16i-section-fix.patch
lance-section-fix.patch
lne390-section-fix.patch
ni52-section-fix.patch
ibmtr-section-fix.patch
smctr-section-fix.patch
wd-section-fix.patch
ni65-section-fix.patch
seeq8005-section-fix.patch
winbond-840-section-fix.patch
fealnx-section-fix.patch
sundance-section-fix.patch
e1000_7033_dump_ring-fix.patch
s2io-build-fix.patch
drivers-net-ns83820c-add-paramter-to-disable-auto.patch
ppp-handle-kmalloc-failures-leak-fix.patch
git-nfs.patch
git-nfs-fixup.patch
git-pcmcia-fixup.patch
git-powerpc-briq_panel-Kconfig-fix.patch
git-sas.patch
serial-fix-uart_bug_txen-test.patch
pcie-check-and-return-bus_register-errors-fix.patch
git-kbuild-build-fix.patch
fix-panic-when-reinserting-adaptec-pcmcia-scsi-card-tidy.patch
areca-raid-linux-scsi-driver.patch
areca-sysfs-fix.patch
git-scsi-target-fixup.patch
usb-hub-driver-improve-use-of-ifdef-fix.patch
pm-usb-hcds-use-pm_event_prethaw-fix.patch
kill-usb-kconfig-warning.patch
rtl8150_disconnect-needs-tasklet_kill.patch
git-supertrak-fixup.patch
git-wireless-bcm43xx-fix.patch
kthread-airoc-race-fix.patch
revert-x86_64-mm-dwarf2-for-inline-asm.patch
revert-x86_64-mm-i386-dwarf2-for-inline-asm.patch
fix-x86_64-mm-allow-users-to-force-a-panic-on-nmi.patch
fix-x86_64-mm-i386-semaphore-to-asm.patch
sleazy-fpu-feature-x86_64-support.patch
x86_64-wire-up-oops_enter-oops_exit.patch
adix-tree-rcu-lockless-readside-update-tidy.patch
mm-tracking-shared-dirty-pages-checks.patch
mm-tracking-shared-dirty-pages-wimp.patch
convert-i386-numa-kva-space-to-bootmem-tidy.patch
reduce-max_nr_zones-make-display-of-highmem-counters-conditional-on-config_highmem-tidy.patch
reduce-max_nr_zones-use-enum-to-define-zones-reformat-and-comment-cleanup.patch
reduce-max_nr_zones-remove-display-of-counters-for-unconfigured-zones-s390-fix.patch
out-of-memory-notifier-tidy.patch
acx1xx-wireless-driver.patch
tiacx-pci-build-fix.patch
tiacx-ia64-fix.patch
tiacx-build-fix.patch
binfmt_elf-consistently-use-loff_t.patch
synchronize_tsc-fixes.patch
add-force-of-use-mmconfig-fix.patch
convert-i386-summit-subarch-to-use-srat-info-for-apicid_to_node-calls-tidy.patch
add-efi-e820-memory-mapping-on-x86.patch
add-efi-e820-memory-mapping-on-x86-tidy.patch
add-efi-e820-memory-mapping-on-x86-fix.patch
i386-adds-smp_call_function_single-fix.patch
swsusp-write-timer.patch
swsusp-write-speedup.patch
swsusp-read-timer.patch
swsusp-read-speedup.patch
swsusp-read-speedup-fix.patch
swsusp-read-speedup-cleanup.patch
swsusp-read-speedup-cleanup-2.patch
deprecate-smbfs-in-favour-of-cifs.patch
edac-new-opteron-athlon64-memory-controller-driver-tidy.patch
x86-microcode-microcode-driver-cleanup-tidy.patch
x86-microcode-add-sysfs-and-hotplug-support-fix.patch
eisa-bus-modalias-attributes-support-1-fix-git-kbuild-fix.patch
add-address_space_operationsbatch_write-fix.patch
alloc_fdtable-cleanup.patch
add-probe_kernel_address.patch
x86-use-probe_kernel_address-in-handle_bug.patch
blockdevc-check-errors.patch
invalidate_bdev-speedup.patch
let-warn_on-warn_on_once-return-the-condition-fix.patch
omap-add-watchdog-driver-support-tweaks.patch
reiserfs-on-demand-bitmap-loading.patch
task-watchers-task-watchers.patch
task-watchers-add-support-for-per-task-watchers.patch
stack-overflow-safe-kdump-crash_use_safe_smp_processor_id-fix.patch
knfsd-add-a-callback-for-when-last-rpc-thread-finishes-tidy.patch
knfsd-separate-out-some-parts-of-nfsd_svc-which-start-nfs-servers-tweaks.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-tidy.patch
knfsd-define-new-nfsdfs-file-portlist-contains-list-of-ports-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
namespaces-add-nsproxy-dont-include-compileh.patch
namespaces-utsname-switch-to-using-uts-namespaces.patch
namespaces-utsname-use-init_utsname-when-appropriate.patch
namespaces-utsname-implement-utsname-namespaces.patch
namespaces-utsname-sysctl-hack.patch
ipc-namespace-core.patch
readahead-sysctl-parameters-fix.patch
make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-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
hpt3xx-rework-rate-filtering-tidy.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
add-hypertransport-capability-defines-fix.patch
initial-generic-hypertransport-interrupt-support-Kconfig-fix.patch
nr_blockdev_pages-in_interrupt-warning.patch
device-suspend-debug.patch
revert-tty-buffering-comment-out-debug-code.patch
slab-leaks3-default-y.patch
x86-kmap_atomic-debugging.patch
jmicron-warning-fix.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
