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

Commit 69048e01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "The three major changes in this patchset is a implementation for
  flexible userspace memory maps, cache-flushing fixes (again), and a
  long-discussed ABI change to make EWOULDBLOCK the same value as
  EAGAIN.

  parisc has been the only platform where we had EWOULDBLOCK != EAGAIN
  to keep HP-UX compatibility.  Since we will probably never implement
  full HP-UX support, we prefer to drop this compatibility to make it
  easier for us with Linux userspace programs which mostly never checked
  for both values.  We don't expect major fall-outs because of this
  change, and if we face some, we will simply rebuild the necessary
  applications in the debian archives"

* 'parisc-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: add flexible mmap memory layout support
  parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
  parisc: convert uapi/asm/stat.h to use native types only
  parisc: wire up sched_setattr and sched_getattr
  parisc: fix cache-flushing
  parisc/sti_console: prefer Linux fonts over built-in ROM fonts
parents 1c0b8a7a 9dabf60d

arch/parisc/include/asm/cacheflush.h

+0 −2
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ void mark_rodata_ro(void); 
static inline void *kmap(struct page *page)

{

	might_sleep();

	flush_dcache_page(page);

	return page_address(page);

}
@@ -144,7 +143,6 @@ static inline void kunmap(struct page *page) 
static inline void *kmap_atomic(struct page *page)

{

	pagefault_disable();

	flush_dcache_page(page);

	return page_address(page);

}

arch/parisc/include/asm/elf.h

+4 −0
Original line number Diff line number Diff line
@@ -348,4 +348,8 @@ struct pt_regs; /* forward declaration... */ 


#define ELF_HWCAP	0



struct mm_struct;

extern unsigned long arch_randomize_brk(struct mm_struct *);

#define arch_randomize_brk arch_randomize_brk



#endif

arch/parisc/include/asm/page.h

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ struct page; 
void clear_page_asm(void *page);

void copy_page_asm(void *to, void *from);

#define clear_user_page(vto, vaddr, page) clear_page_asm(vto)

#define copy_user_page(vto, vfrom, vaddr, page) copy_page_asm(vto, vfrom)

void copy_user_page(void *vto, void *vfrom, unsigned long vaddr,

			struct page *pg);



/* #define CONFIG_PARISC_TMPALIAS */

arch/parisc/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -511,6 +511,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, 
/* We provide our own get_unmapped_area to provide cache coherency */



#define HAVE_ARCH_UNMAPPED_AREA

#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN



#define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG

#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

arch/parisc/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#endif

#define current_text_addr() ({ void *pc; current_ia(pc); pc; })



#define HAVE_ARCH_PICK_MMAP_LAYOUT



#define TASK_SIZE_OF(tsk)       ((tsk)->thread.task_size)

#define TASK_SIZE	        TASK_SIZE_OF(current)

#define TASK_UNMAPPED_BASE      (current->thread.map_base)