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

Commit bab2d8c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-3.4' of git://openrisc.net/jonas/linux 

Pull OpenRISC changes for 3.4 from Jonas Bonn:
 "This series for the OpenRISC architecture consists of mostly trivial
  fixups.  The most interesting bits of the series are:

  * A fix to the timer code whereby the shortest trigger period is set
    to 100 cycles; previously, it was possible to set this to 1 cycle,
    but by the time the register was written, that time had already
    passed and the timer interrupt would not go off until the cycle
    counter had gone a full cycle.

  * Allowing a device tree binary to be passed in to the kernel from
    u-boot.  The OpenRISC architecture has been recently merged into
    upstream u-boot, so this change gets OpenRISC Linux into sync with
    that project."

* tag 'for-3.4' of git://openrisc.net/jonas/linux:
  OpenRISC: Remove memory_start/end prototypes
  openrisc: remove semicolon from KSTK_ defs
  openrisc: sanitize use of orig_gpr11
  openrisc: fix virt_addr_valid
  OpenRISC: Export dump_stack()
  OpenRISC: Select GENERIC_ATOMIC64
  openrisc: Set shortest clock event to 100 ticks
  openrisc: included linux/thread_info.h twice
  OpenRISC: Use set_current_blocked() and block_sigmask()
  OpenRISC: Don't mask signals if we fail to setup signal stack
  OpenRISC: No need to reset handler if SA_ONESHOT
  OpenRISC: Don't reimplement force_sigsegv()
  openrisc: enable passing of flattened device tree pointer
  arch/openrisc/mm/init.c: trivial: use BUG_ON
parents 0e65ae09 fa8d9d74

arch/openrisc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config OPENRISC 
	select GENERIC_IRQ_SHOW

	select GENERIC_IOMAP

	select GENERIC_CPU_DEVICES

	select GENERIC_ATOMIC64



config MMU

	def_bool y

arch/openrisc/include/asm/page.h

+1 −5
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ typedef struct page *pgtable_t; 
#define __pgd(x)	((pgd_t) { (x) })

#define __pgprot(x)	((pgprot_t) { (x) })



extern unsigned long memory_start;

extern unsigned long memory_end;



#endif /* !__ASSEMBLY__ */
@@ -94,8 +91,7 @@ extern unsigned long memory_end; 


#define pfn_valid(pfn)          ((pfn) < max_mapnr)



#define virt_addr_valid(kaddr)  (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \

				((void *)(kaddr) < (void *)memory_end))

#define virt_addr_valid(kaddr)	(pfn_valid(virt_to_pfn(kaddr)))



#endif /* __ASSEMBLY__ */

arch/openrisc/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ extern inline void prepare_to_copy(struct task_struct *tsk) 
#define INIT_THREAD  { }





#define KSTK_EIP(tsk)   (task_pt_regs(tsk)->pc);

#define KSTK_ESP(tsk)   (task_pt_regs(tsk)->sp);

#define KSTK_EIP(tsk)   (task_pt_regs(tsk)->pc)

#define KSTK_ESP(tsk)   (task_pt_regs(tsk)->sp)





extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);

arch/openrisc/include/asm/ptrace.h

+5 −1
Original line number Diff line number Diff line
@@ -73,9 +73,13 @@ struct pt_regs { 
		};

	};

	long  pc;

	/* For restarting system calls:

	 * Set to syscall number for syscall exceptions,

	 * -1 for all other exceptions.

	 */

	long  orig_gpr11;	/* For restarting system calls */

	long  syscallno;	/* Syscall number (used by strace) */

	long dummy;		/* Cheap alignment fix */

	long dummy2;		/* Cheap alignment fix */

};



/* TODO: Rename this to REDZONE because that's what it is */

arch/openrisc/include/asm/syscall.h

+2 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
static inline int

syscall_get_nr(struct task_struct *task, struct pt_regs *regs)

{

	return regs->syscallno ? regs->syscallno : -1;

	return regs->orig_gpr11;

}



static inline void
@@ -50,10 +50,7 @@ static inline void 
syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,

			 int error, long val)

{

	if (error)

		regs->gpr[11] = -error;

	else

		regs->gpr[11] = val;

	regs->gpr[11] = (long) error ?: val;

}



static inline void