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

Commit 3ba113d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: (23 commits)
  parisc: move dereference_function_descriptor to process.c
  parisc: Move kernel Elf_Fdesc define to <asm/elf.h>
  parisc: fix build when ARCH_HAS_KMAP
  parisc: fix "make tar-pkg"
  parisc: drivers: fix warnings
  parisc: select BUG always
  parisc: asm/pdc.h should include asm/page.h
  parisc: led: remove proc_dir_entry::owner
  parisc: fix macro expansion in atomic.h
  parisc: iosapic: fix build breakage
  parisc: oops_enter()/oops_exit() in die()
  parisc: document light weight syscall ABI
  parisc: blink all or loadavg LEDs on oops
  parisc: add ftrace (function and graph tracer) functionality
  parisc: simplify sys_clone()
  parisc: add LATENCYTOP_SUPPORT and CONFIG_STACKTRACE_SUPPORT
  parisc: allow to build with 16k default kernel page size
  parisc: expose 32/64-bit capabilities in cpuinfo
  parisc: use constants instead of numbers in assembly
  parisc: fix usage of 32bit PTE page table entries on 32bit kernels
  ...
parents bad6a5c0 b609308e

arch/parisc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -9,9 +9,13 @@ config PARISC 
	def_bool y

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_FUNCTION_TRACER if 64BIT

	select HAVE_FUNCTION_GRAPH_TRACER if 64BIT

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT

	select RTC_CLASS

	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

	select BUG

	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

	  in many of their workstations & servers (HP9000 700 and 800 series,
@@ -75,6 +79,9 @@ config GENERIC_HARDIRQS 
config GENERIC_IRQ_PROBE

	def_bool y



config HAVE_LATENCYTOP_SUPPORT

        def_bool y



config IRQ_PER_CPU

	bool

	default y
@@ -83,6 +90,9 @@ config IRQ_PER_CPU 
config PM

	bool



config STACKTRACE_SUPPORT

	def_bool y



config ISA_DMA_API

	bool

arch/parisc/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -56,7 +56,9 @@ cflags-y += -mdisable-fpregs 


# Without this, "ld -r" results in .text sections that are too big

# (> 0x40000) for branches to reach stubs.

ifndef CONFIG_FUNCTION_TRACER

  cflags-y	+= -ffunction-sections

endif



# select which processor to optimise for

cflags-$(CONFIG_PA7100)		+= -march=1.1 -mschedule=7100

arch/parisc/include/asm/atomic.h

+9 −9
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * Since "a" is usually an address, use one spinlock per cacheline.

 */

#  define ATOMIC_HASH_SIZE 4

#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))

#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) (a))/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))



extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
@@ -222,13 +222,13 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) 


#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)i),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)i),(v))))

#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)(i)),(v))))

#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)(i)),(v))))

#define atomic_inc(v)	((void)(__atomic_add_return(   1,(v))))

#define atomic_dec(v)	((void)(__atomic_add_return(  -1,(v))))



#define atomic_add_return(i,v)	(__atomic_add_return( ((int)i),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)i),(v)))

#define atomic_add_return(i,v)	(__atomic_add_return( ((int)(i)),(v)))

#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)(i)),(v)))

#define atomic_inc_return(v)	(__atomic_add_return(   1,(v)))

#define atomic_dec_return(v)	(__atomic_add_return(  -1,(v)))
@@ -289,13 +289,13 @@ atomic64_read(const atomic64_t *v) 
	return v->counter;

}



#define atomic64_add(i,v)	((void)(__atomic64_add_return( ((s64)i),(v))))

#define atomic64_sub(i,v)	((void)(__atomic64_add_return(-((s64)i),(v))))

#define atomic64_add(i,v)	((void)(__atomic64_add_return( ((s64)(i)),(v))))

#define atomic64_sub(i,v)	((void)(__atomic64_add_return(-((s64)(i)),(v))))

#define atomic64_inc(v)		((void)(__atomic64_add_return(   1,(v))))

#define atomic64_dec(v)		((void)(__atomic64_add_return(  -1,(v))))



#define atomic64_add_return(i,v)	(__atomic64_add_return( ((s64)i),(v)))

#define atomic64_sub_return(i,v)	(__atomic64_add_return(-((s64)i),(v)))

#define atomic64_add_return(i,v)	(__atomic64_add_return( ((s64)(i)),(v)))

#define atomic64_sub_return(i,v)	(__atomic64_add_return(-((s64)(i)),(v)))

#define atomic64_inc_return(v)		(__atomic64_add_return(   1,(v)))

#define atomic64_dec_return(v)		(__atomic64_add_return(  -1,(v)))

arch/parisc/include/asm/cacheflush.h

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ void mark_rodata_ro(void); 


#ifdef CONFIG_PA8X00

/* Only pa8800, pa8900 needs this */



#include <asm/kmap_types.h>



#define ARCH_HAS_KMAP



void kunmap_parisc(void *addr);

arch/parisc/include/asm/elf.h

+10 −0
Original line number Diff line number Diff line
@@ -168,6 +168,16 @@ typedef struct elf64_fdesc { 
	__u64	gp;

} Elf64_Fdesc;



#ifdef __KERNEL__



#ifdef CONFIG_64BIT

#define Elf_Fdesc	Elf64_Fdesc

#else

#define Elf_Fdesc	Elf32_Fdesc

#endif /*CONFIG_64BIT*/



#endif /*__KERNEL__*/



/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */



#define PT_HP_TLS		(PT_LOOS + 0x0)