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

Commit 95948c31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] mm: add ZONE_DMA to 31-bit config again
  [S390] mm: add page fault retry handling
  [S390] mm: handle kernel caused page fault oom situations
  [S390] delay: implement ndelay
  [S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
  [S390] hwsampler: allow cpu hotplug
  [S390] uaccess: turn __access_ok() into a define
  [S390] irq: merge irq.c and s390_ext.c
  [S390] irq: fix service signal external interrupt handling
  [S390] pfault: always enable service signal interrupt
parents 45acab01 69dbb2f7

arch/s390/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ config MMU 
	def_bool y

	def_bool y





config ZONE_DMA

config ZONE_DMA

	def_bool y if 64BIT

	def_bool y





config LOCKDEP_SUPPORT

config LOCKDEP_SUPPORT

	def_bool y

	def_bool y

arch/s390/appldata/appldata_mem.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -92,9 +92,7 @@ static void appldata_get_mem_data(void *data) 
	mem_data->pswpin     = ev[PSWPIN];

	mem_data->pswpin     = ev[PSWPIN];

	mem_data->pswpout    = ev[PSWPOUT];

	mem_data->pswpout    = ev[PSWPOUT];

	mem_data->pgalloc    = ev[PGALLOC_NORMAL];

	mem_data->pgalloc    = ev[PGALLOC_NORMAL];

#ifdef CONFIG_ZONE_DMA

	mem_data->pgalloc    += ev[PGALLOC_DMA];

	mem_data->pgalloc    += ev[PGALLOC_DMA];

#endif

	mem_data->pgfault    = ev[PGFAULT];

	mem_data->pgfault    = ev[PGFAULT];

	mem_data->pgmajfault = ev[PGMAJFAULT];

	mem_data->pgmajfault = ev[PGMAJFAULT];

arch/s390/include/asm/delay.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -14,10 +14,12 @@ 
#ifndef _S390_DELAY_H

#ifndef _S390_DELAY_H

#define _S390_DELAY_H

#define _S390_DELAY_H





extern void __udelay(unsigned long long usecs);

void __ndelay(unsigned long long nsecs);

extern void udelay_simple(unsigned long long usecs);

void __udelay(unsigned long long usecs);

extern void __delay(unsigned long loops);

void udelay_simple(unsigned long long usecs);

void __delay(unsigned long loops);





#define ndelay(n) __ndelay((unsigned long long) (n))

#define udelay(n) __udelay((unsigned long long) (n))

#define udelay(n) __udelay((unsigned long long) (n))

#define mdelay(n) __udelay((unsigned long long) (n) * 1000)

#define mdelay(n) __udelay((unsigned long long) (n) * 1000)

arch/s390/include/asm/irq.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_IRQ_H

#define _ASM_IRQ_H





#include <linux/hardirq.h>

#include <linux/hardirq.h>

#include <linux/types.h>





enum interruption_class {

enum interruption_class {

	EXTERNAL_INTERRUPT,

	EXTERNAL_INTERRUPT,
@@ -31,4 +32,11 @@ enum interruption_class { 
	NR_IRQS,

	NR_IRQS,

};

};





typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);



int register_external_interrupt(u16 code, ext_int_handler_t handler);

int unregister_external_interrupt(u16 code, ext_int_handler_t handler);

void service_subclass_irq_register(void);

void service_subclass_irq_unregister(void);



#endif /* _ASM_IRQ_H */
 
#endif /* _ASM_IRQ_H */

arch/s390/include/asm/s390_ext.h

deleted100644 → 0
+0 −17
Original line number Original line Diff line number Diff line 
/*

 *    Copyright IBM Corp. 1999,2010

 *    Author(s): Holger Smolinski <Holger.Smolinski@de.ibm.com>,

 *		 Martin Schwidefsky <schwidefsky@de.ibm.com>,

 */



#ifndef _S390_EXTINT_H

#define _S390_EXTINT_H



#include <linux/types.h>



typedef void (*ext_int_handler_t)(unsigned int, unsigned int, unsigned long);



int register_external_interrupt(__u16 code, ext_int_handler_t handler);

int unregister_external_interrupt(__u16 code, ext_int_handler_t handler);



#endif /* _S390_EXTINT_H */