Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cdf8dbe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull uaccess.h prepwork from Al Viro:
 "Preparations to tree-wide switch to use of linux/uaccess.h (which,
  obviously, will allow to start unifying stuff for real). The last step
  there, ie

    PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
    sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
            `git grep -l "$PATT"|grep -v ^include/linux/uaccess.h`

  is not taken here - I would prefer to do it once just before or just
  after -rc1.  However, everything should be ready for it"

* 'work.uaccess2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  remove a stray reference to asm/uaccess.h in docs
  sparc64: separate extable_64.h, switch elf_64.h to it
  score: separate extable.h, switch module.h to it
  mips: separate extable.h, switch module.h to it
  x86: separate extable.h, switch sections.h to it
  remove stray include of asm/uaccess.h from cacheflush.h
  mn10300: remove a bogus processor.h->uaccess.h include
  xtensa: split uaccess.h into C and asm sides
  bonding: quit messing with IOCTL
  kill __kernel_ds_p off
  mn10300: finish verify_area() off
  frv: move HAVE_ARCH_UNMAPPED_AREA to pgtable.h
  exceptions: detritus removal
parents 6b25e21f aa7eb9ad

Documentation/DocBook/kernel-hacking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress); 
    <function>get_user()</function>

    /

    <function>put_user()</function>

    <filename class="headerfile">include/asm/uaccess.h</filename>

    <filename class="headerfile">include/linux/uaccess.h</filename>

   </title>  



   <para>

arch/arm/mm/fault.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ static inline int fsr_fs(unsigned int fsr) 
#endif



void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);

unsigned long search_exception_table(unsigned long addr);

void early_abt_enable(void);



#endif	/* __ARCH_ARM_FAULT_H */

arch/frv/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -522,5 +522,6 @@ extern void __init pgtable_cache_init(void); 
#ifndef __ASSEMBLY__

extern void __init paging_init(void);

#endif /* !__ASSEMBLY__ */

#define HAVE_ARCH_UNMAPPED_AREA



#endif /* _ASM_PGTABLE_H */

arch/frv/include/asm/segment.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ typedef struct { 
#define get_ds()		(KERNEL_DS)

#define get_fs()		(__current_thread_info->addr_limit)

#define segment_eq(a, b)	((a).seg == (b).seg)

#define __kernel_ds_p()		segment_eq(get_fs(), KERNEL_DS)

#define get_addr_limit()	(get_fs().seg)



#define set_fs(_x)					\

arch/frv/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <asm/segment.h>

#include <asm/sections.h>



#define HAVE_ARCH_UNMAPPED_AREA	/* we decide where to put mmaps */



#define __ptr(x) ((unsigned long __force *)(x))



#define VERIFY_READ	0