]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Nov 2015 03:34:22 +0000 (19:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Nov 2015 03:34:22 +0000 (19:34 -0800)
Pull x86 cleanups from Ingo Molnar:
 "An early_printk cleanup plus deinlining enhancements"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/early_printk: Set __iomem address space for IO
  x86/signal: Deinline get_sigframe, save 240 bytes
  x86: Deinline early_console_register, save 403 bytes
  x86/e820: Deinline e820_type_to_string, save 126 bytes

1  2 
arch/x86/kernel/signal.c

diff --combined arch/x86/kernel/signal.c
index d87ce92d340448fe90f6fb34a297c161cdc36f7c,2c3336b6b264f1dbff0c9ff9f79b054d80a36c77..32165d6499795fd5cff24c80561f984df8af52fd
@@@ -196,7 -196,7 +196,7 @@@ static unsigned long align_sigframe(uns
        return sp;
  }
  
- static inline void __user *
+ static void __user *
  get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
             void __user **fpstate)
  {
@@@ -299,7 -299,7 +299,7 @@@ __setup_frame(int sig, struct ksignal *
  
        if (current->mm->context.vdso)
                restorer = current->mm->context.vdso +
 -                      selected_vdso32->sym___kernel_sigreturn;
 +                      vdso_image_32.sym___kernel_sigreturn;
        else
                restorer = &frame->retcode;
        if (ksig->ka.sa.sa_flags & SA_RESTORER)
@@@ -363,7 -363,7 +363,7 @@@ static int __setup_rt_frame(int sig, st
  
                /* Set up to return from userspace.  */
                restorer = current->mm->context.vdso +
 -                      selected_vdso32->sym___kernel_rt_sigreturn;
 +                      vdso_image_32.sym___kernel_rt_sigreturn;
                if (ksig->ka.sa.sa_flags & SA_RESTORER)
                        restorer = ksig->ka.sa.sa_restorer;
                put_user_ex(restorer, &frame->pretcode);