Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/kernel/unwind.c b/kernel/unwind.c
index f7e50d16dbf6..ed0a21d4a902 100644
--- a/kernel/unwind.c
+++ b/kernel/unwind.c
@@ -938,8 +938,11 @@ int unwind(struct unwind_frame_info *frame)
                 else {
                         retAddrReg = state.version <= 1 ? *ptr++ : get_uleb128(&ptr, end);
                         /* skip augmentation */
-                        if (((const char *)(cie + 2))[1] == 'z')
-                                ptr += get_uleb128(&ptr, end);
+                        if (((const char *)(cie + 2))[1] == 'z') {
+                                uleb128_t augSize = get_uleb128(&ptr, end);
+
+                                ptr += augSize;
+                        }
                         if (ptr > end
                            || retAddrReg >= ARRAY_SIZE(reg_info)
                            || REG_INVALID(retAddrReg)
@@ -963,9 +966,7 @@ int unwind(struct unwind_frame_info *frame)
         if (cie == NULL || fde == NULL) {
 #ifdef CONFIG_FRAME_POINTER
                 unsigned long top, bottom;
-#endif
 
-#ifdef CONFIG_FRAME_POINTER
                 top = STACK_TOP(frame->task);
                 bottom = STACK_BOTTOM(frame->task);
 # if FRAME_RETADDR_OFFSET < 0