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

2 files changed, 3 insertions, 23 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 0e318c905eea..c5ee4ce60b57 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -186,6 +186,9 @@ config DMA_NONCOHERENT
 config NEED_DMA_MAP_STATE
         def_bool DMA_NONCOHERENT
 
+config NEED_SG_DMA_LENGTH
+        def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index d4104ce9fe53..6c4bbba2a675 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -436,29 +436,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                              0, sizeof(struct pt_dspregs),
                                              (const void __user *)data);
 #endif
-#ifdef CONFIG_BINFMT_ELF_FDPIC
-        case PTRACE_GETFDPIC: {
-                unsigned long tmp = 0;
-
-                switch (addr) {
-                case PTRACE_GETFDPIC_EXEC:
-                        tmp = child->mm->context.exec_fdpic_loadmap;
-                        break;
-                case PTRACE_GETFDPIC_INTERP:
-                        tmp = child->mm->context.interp_fdpic_loadmap;
-                        break;
-                default:
-                        break;
-                }
-
-                ret = 0;
-                if (put_user(tmp, datap)) {
-                        ret = -EFAULT;
-                        break;
-                }
-                break;
-        }
-#endif
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;