summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/ptrace.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-06-10 11:22:26 +0200
committerDavid S. Miller <davem@davemloft.net>2008-06-10 11:22:26 +0200
commit65b53e4cc90e59936733b3b95b9451d2ca47528d (patch)
tree29932718192962671c48c3fd1ea017a6112459e8 /include/asm-ia64/ptrace.h
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff)
parentipv6 netns: init net is used to set bindv6only for new sock (diff)
downloadlinux-65b53e4cc90e59936733b3b95b9451d2ca47528d.tar.xz
linux-65b53e4cc90e59936733b3b95b9451d2ca47528d.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/tg3.c drivers/net/wireless/rt2x00/rt2x00dev.c net/mac80211/ieee80211_i.h
Diffstat (limited to 'include/asm-ia64/ptrace.h')
-rw-r--r--include/asm-ia64/ptrace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/ptrace.h b/include/asm-ia64/ptrace.h
index 4b2a8d40ebc5..15f8dcfe6eee 100644
--- a/include/asm-ia64/ptrace.h
+++ b/include/asm-ia64/ptrace.h
@@ -76,7 +76,7 @@
# define KERNEL_STACK_SIZE_ORDER 0
#endif
-#define IA64_RBS_OFFSET ((IA64_TASK_SIZE + IA64_THREAD_INFO_SIZE + 15) & ~15)
+#define IA64_RBS_OFFSET ((IA64_TASK_SIZE + IA64_THREAD_INFO_SIZE + 31) & ~31)
#define IA64_STK_OFFSET ((1 << KERNEL_STACK_SIZE_ORDER)*PAGE_SIZE)
#define KERNEL_STACK_SIZE IA64_STK_OFFSET