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

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

Merge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv 

* 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
  FRV: Use generic show_interrupts()
  FRV: Convert genirq namespace
  frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
  frv: Convert cpu irq_chip to new functions
  frv: Convert mb93493 irq_chip to new functions
  frv: Convert mb93093 irq_chip to new function
  frv: Convert mb93091 irq_chip to new functions
  frv: Fix typo from __do_IRQ overhaul
  frv: Remove stale irq_chip.end
  FRV: Do some cleanups
  FRV: Missing node arg in alloc_thread_info_node() macro
  NOMMU: implement access_remote_vm
  NOMMU: support SMP dynamic percpu_alloc
  NOMMU: percpu should use is_vmalloc_addr().
parents 90f1e748 3062aa50

arch/frv/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ menu "Power management options" 


config ARCH_SUSPEND_POSSIBLE

	def_bool y

	depends on !SMP



source kernel/power/Kconfig

endmenu

arch/frv/include/asm/system.h

+0 −9
Original line number Diff line number Diff line
@@ -45,21 +45,12 @@ do { \ 
#define wmb()			asm volatile ("membar" : : :"memory")

#define read_barrier_depends()	do { } while (0)



#ifdef CONFIG_SMP

#define smp_mb()			mb()

#define smp_rmb()			rmb()

#define smp_wmb()			wmb()

#define smp_read_barrier_depends()	read_barrier_depends()

#define set_mb(var, value) \

	do { xchg(&var, (value)); } while (0)

#else

#define smp_mb()			barrier()

#define smp_rmb()			barrier()

#define smp_wmb()			barrier()

#define smp_read_barrier_depends()	do {} while(0)

#define set_mb(var, value) \

	do { var = (value); barrier(); } while (0)

#endif



extern void die_if_kernel(const char *, ...) __attribute__((format(printf, 1, 2)));

extern void free_initmem(void);

arch/frv/include/asm/thread_info.h

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


#define THREAD_SIZE		8192



#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR



/*

 * low level task data that entry.S needs immediate access to

 * - this struct should fit entirely inside of one cache line
@@ -87,7 +89,7 @@ register struct thread_info *__current_thread_info asm("gr15"); 
#define alloc_thread_info_node(tsk, node)			\

		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#else

#define alloc_thread_info_node(tsk)				\

#define alloc_thread_info_node(tsk, node)			\

		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)

#endif

arch/frv/kernel/irq-mb93091.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void frv_fpga_mask(struct irq_data *d) 


static void frv_fpga_ack(struct irq_data *d)

{

	__clr_IFR(1 << (irq - IRQ_BASE_FPGA));

	__clr_IFR(1 << (d->irq - IRQ_BASE_FPGA));

}



static void frv_fpga_mask_ack(struct irq_data *d)

include/linux/vmalloc.h

+32 −0
Original line number Diff line number Diff line
@@ -95,10 +95,27 @@ extern struct vm_struct *remove_vm_area(const void *addr); 


extern int map_vm_area(struct vm_struct *area, pgprot_t prot,

			struct page ***pages);

#ifdef CONFIG_MMU

extern int map_kernel_range_noflush(unsigned long start, unsigned long size,

				    pgprot_t prot, struct page **pages);

extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long size);

extern void unmap_kernel_range(unsigned long addr, unsigned long size);

#else

static inline int

map_kernel_range_noflush(unsigned long start, unsigned long size,

			pgprot_t prot, struct page **pages)

{

	return size >> PAGE_SHIFT;

}

static inline void

unmap_kernel_range_noflush(unsigned long addr, unsigned long size)

{

}

static inline void

unmap_kernel_range(unsigned long addr, unsigned long size)

{

}

#endif



/* Allocate/destroy a 'vmalloc' VM area. */

extern struct vm_struct *alloc_vm_area(size_t size);
@@ -116,11 +133,26 @@ extern struct vm_struct *vmlist; 
extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);



#ifdef CONFIG_SMP

# ifdef CONFIG_MMU

struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,

				     const size_t *sizes, int nr_vms,

				     size_t align);



void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);

# else

static inline struct vm_struct **

pcpu_get_vm_areas(const unsigned long *offsets,

		const size_t *sizes, int nr_vms,

		size_t align)

{

	return NULL;

}



static inline void

pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)

{

}

# endif

#endif



#endif /* _LINUX_VMALLOC_H */