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

Commit 59c288ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'frv' and 'mn10300' 

* frv:
  FRV: Implement new-style ptrace
  FRV: Don't turn on TIF_SYSCALL_TRACE unconditionally in syscall prologue
  FRV: Implement TIF_NOTIFY_RESUME
  FRV: Remove in-kernel strace code
  FRV: BUG to BUG_ON changes
  FRV: bitops: Change the bitmap index from int to unsigned long

* mn10300:
  MN10300: Add utrace/tracehooks support
  MN10300: Don't set the dirty bit in the DTLB entries in the TLB-miss handler
parents 49c35561 4a3b9893 5d289964

arch/frv/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config FRV 
	bool

	default y

	select HAVE_IDE

	select HAVE_ARCH_TRACEHOOK



config ZONE_DMA

	bool

arch/frv/include/asm/bitops.h

+15 −14
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ extern unsigned long atomic_test_and_XOR_mask(unsigned long mask, volatile unsig 
#define atomic_clear_mask(mask, v)	atomic_test_and_ANDNOT_mask((mask), (v))

#define atomic_set_mask(mask, v)	atomic_test_and_OR_mask((mask), (v))



static inline int test_and_clear_bit(int nr, volatile void *addr)

static inline int test_and_clear_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *ptr = addr;

	unsigned long mask = 1UL << (nr & 31);
@@ -120,7 +120,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) 
	return (atomic_test_and_ANDNOT_mask(mask, ptr) & mask) != 0;

}



static inline int test_and_set_bit(int nr, volatile void *addr)

static inline int test_and_set_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *ptr = addr;

	unsigned long mask = 1UL << (nr & 31);
@@ -128,7 +128,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) 
	return (atomic_test_and_OR_mask(mask, ptr) & mask) != 0;

}



static inline int test_and_change_bit(int nr, volatile void *addr)

static inline int test_and_change_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *ptr = addr;

	unsigned long mask = 1UL << (nr & 31);
@@ -136,22 +136,22 @@ static inline int test_and_change_bit(int nr, volatile void *addr) 
	return (atomic_test_and_XOR_mask(mask, ptr) & mask) != 0;

}



static inline void clear_bit(int nr, volatile void *addr)

static inline void clear_bit(unsigned long nr, volatile void *addr)

{

	test_and_clear_bit(nr, addr);

}



static inline void set_bit(int nr, volatile void *addr)

static inline void set_bit(unsigned long nr, volatile void *addr)

{

	test_and_set_bit(nr, addr);

}



static inline void change_bit(int nr, volatile void * addr)

static inline void change_bit(unsigned long nr, volatile void *addr)

{

	test_and_change_bit(nr, addr);

}



static inline void __clear_bit(int nr, volatile void * addr)

static inline void __clear_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask;
@@ -161,7 +161,7 @@ static inline void __clear_bit(int nr, volatile void * addr) 
	*a &= ~mask;

}



static inline void __set_bit(int nr, volatile void * addr)

static inline void __set_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask;
@@ -171,7 +171,7 @@ static inline void __set_bit(int nr, volatile void * addr) 
	*a |= mask;

}



static inline void __change_bit(int nr, volatile void *addr)

static inline void __change_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask;
@@ -181,7 +181,7 @@ static inline void __change_bit(int nr, volatile void *addr) 
	*a ^= mask;

}



static inline int __test_and_clear_bit(int nr, volatile void * addr)

static inline int __test_and_clear_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask, retval;
@@ -193,7 +193,7 @@ static inline int __test_and_clear_bit(int nr, volatile void * addr) 
	return retval;

}



static inline int __test_and_set_bit(int nr, volatile void * addr)

static inline int __test_and_set_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask, retval;
@@ -205,7 +205,7 @@ static inline int __test_and_set_bit(int nr, volatile void * addr) 
	return retval;

}



static inline int __test_and_change_bit(int nr, volatile void * addr)

static inline int __test_and_change_bit(unsigned long nr, volatile void *addr)

{

	volatile unsigned long *a = addr;

	int mask, retval;
@@ -220,12 +220,13 @@ static inline int __test_and_change_bit(int nr, volatile void * addr) 
/*

 * This routine doesn't need to be atomic.

 */

static inline int __constant_test_bit(int nr, const volatile void * addr)

static inline int

__constant_test_bit(unsigned long nr, const volatile void *addr)

{

	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;

}



static inline int __test_bit(int nr, const volatile void * addr)

static inline int __test_bit(unsigned long nr, const volatile void *addr)

{

	int 	* a = (int *) addr;

	int	mask;

arch/frv/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ do { \ 
} while(0)



#define USE_ELF_CORE_DUMP

#define CORE_DUMP_USE_REGSET

#define ELF_FDPIC_CORE_EFLAGS	EF_FRV_FDPIC

#define ELF_EXEC_PAGESIZE	16384

arch/frv/include/asm/pci.h

+2 −5
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static inline void pci_dma_sync_single(struct pci_dev *hwdev, 
				       dma_addr_t dma_handle,

				       size_t size, int direction)

{

	if (direction == PCI_DMA_NONE)

                BUG();

	BUG_ON(direction == PCI_DMA_NONE);



	frv_cache_wback_inv((unsigned long)bus_to_virt(dma_handle),

			    (unsigned long)bus_to_virt(dma_handle) + size);
@@ -105,9 +104,7 @@ static inline void pci_dma_sync_sg(struct pci_dev *hwdev, 
				   int nelems, int direction)

{

	int i;



	if (direction == PCI_DMA_NONE)

                BUG();

	BUG_ON(direction == PCI_DMA_NONE);



	for (i = 0; i < nelems; i++)

		frv_cache_wback_inv(sg_dma_address(&sg[i]),

arch/frv/include/asm/ptrace.h

+10 −1
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
#ifdef __KERNEL__

#ifndef __ASSEMBLY__



struct task_struct;



/*

 * we dedicate GR28 to keeping a pointer to the current exception frame

 * - gr28 is destroyed on entry to the kernel from userspace
@@ -73,11 +75,18 @@ register struct pt_regs *__frame asm("gr28"); 


#define user_mode(regs)			(!((regs)->psr & PSR_S))

#define instruction_pointer(regs)	((regs)->pc)

#define user_stack_pointer(regs)	((regs)->sp)



extern unsigned long user_stack(const struct pt_regs *);

extern void show_regs(struct pt_regs *);

#define profile_pc(regs) ((regs)->pc)

#endif



#define task_pt_regs(task) ((task)->thread.frame0)



#define arch_has_single_step()	(1)

extern void user_enable_single_step(struct task_struct *);

extern void user_disable_single_step(struct task_struct *);



#endif /* !__ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_PTRACE_H */