Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (225 commits)
  [PATCH] Don't set calgary iommu as default y
  [PATCH] i386/x86-64: New Intel feature flags
  [PATCH] x86: Add a cumulative thermal throttle event counter.
  [PATCH] i386: Make the jiffies compares use the 64bit safe macros.
  [PATCH] x86: Refactor thermal throttle processing
  [PATCH] Add 64bit jiffies compares (for use with get_jiffies_64)
  [PATCH] Fix unwinder warning in traps.c
  [PATCH] x86: Allow disabling early pci scans with pci=noearly or disallowing conf1
  [PATCH] x86: Move direct PCI scanning functions out of line
  [PATCH] i386/x86-64: Make all early PCI scans dependent on CONFIG_PCI
  [PATCH] Don't leak NT bit into next task
  [PATCH] i386/x86-64: Work around gcc bug with noreturn functions in unwinder
  [PATCH] Fix some broken white space in ia32_signal.c
  [PATCH] Initialize argument registers for 32bit signal handlers.
  [PATCH] Remove all traces of signal number conversion
  [PATCH] Don't synchronize time reading on single core AMD systems
  [PATCH] Remove outdated comment in x86-64 mmconfig code
  [PATCH] Use string instructions for Core2 copy/clear
  [PATCH] x86: - restore i8259A eoi status on resume
  [PATCH] i386: Split multi-line printk in oops output.
  ...

1 files changed, 21 insertions, 5 deletions

diff --git a/arch/x86_64/lib/csum-copy.S b/arch/x86_64/lib/csum-copy.S
index 72fd55ee896e..f0dba36578ea 100644
--- a/arch/x86_64/lib/csum-copy.S
+++ b/arch/x86_64/lib/csum-copy.S
@@ -5,8 +5,9 @@
  * License.  See the file COPYING in the main directory of this archive
  * for more details. No warranty for anything given at all.
  */
-        #include <linux/linkage.h>
-        #include <asm/errno.h>
+#include <linux/linkage.h>
+#include <asm/dwarf2.h>
+#include <asm/errno.h>
 
 /*
  * Checksum copy with exception handling.
@@ -53,19 +54,24 @@
         .endm
         
                                 
-        .globl csum_partial_copy_generic
-        .p2align 4
-csum_partial_copy_generic:
+ENTRY(csum_partial_copy_generic)
+        CFI_STARTPROC
         cmpl     $3*64,%edx
         jle      .Lignore
 
 .Lignore:               
         subq  $7*8,%rsp
+        CFI_ADJUST_CFA_OFFSET 7*8
         movq  %rbx,2*8(%rsp)
+        CFI_REL_OFFSET rbx, 2*8
         movq  %r12,3*8(%rsp)
+        CFI_REL_OFFSET r12, 3*8
         movq  %r14,4*8(%rsp)
+        CFI_REL_OFFSET r14, 4*8
         movq  %r13,5*8(%rsp)
+        CFI_REL_OFFSET r13, 5*8
         movq  %rbp,6*8(%rsp)
+        CFI_REL_OFFSET rbp, 6*8
 
         movq  %r8,(%rsp)
         movq  %r9,1*8(%rsp)
@@ -208,14 +214,22 @@ csum_partial_copy_generic:
         addl %ebx,%eax
         adcl %r9d,%eax          /* carry */
                         
+        CFI_REMEMBER_STATE
 .Lende:
         movq 2*8(%rsp),%rbx
+        CFI_RESTORE rbx
         movq 3*8(%rsp),%r12
+        CFI_RESTORE r12
         movq 4*8(%rsp),%r14
+        CFI_RESTORE r14
         movq 5*8(%rsp),%r13
+        CFI_RESTORE r13
         movq 6*8(%rsp),%rbp
+        CFI_RESTORE rbp
         addq $7*8,%rsp
+        CFI_ADJUST_CFA_OFFSET -7*8
         ret
+        CFI_RESTORE_STATE
 
         /* Exception handlers. Very simple, zeroing is done in the wrappers */
 .Lbad_source:
@@ -231,3 +245,5 @@ csum_partial_copy_generic:
         jz   .Lende     
         movl $-EFAULT,(%rax)
         jmp .Lende
+        CFI_ENDPROC
+ENDPROC(csum_partial_copy_generic)