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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 patches from Martin Schwidefsky:
 "The biggest patch is the rework of the smp code, something I wanted to
  do for some time.  There are some patches for our various dump methods
  and one new thing: z/VM LGR detection.  LGR stands for linux-guest-
  relocation and is the guest migration feature of z/VM.  For debugging
  purposes we keep a log of the systems where a specific guest has lived."

Fix up trivial conflict in arch/s390/kernel/smp.c due to the scheduler
cleanup having removed some code next to removed s390 code.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] kernel: Pass correct stack for smp_call_ipl_cpu()
  [S390] Ensure that vmcore_info pointer is never accessed directly
  [S390] dasd: prevent validate server for offline devices
  [S390] Remove monolithic build option for zcrypt driver.
  [S390] stack dump: fix indentation in output
  [S390] kernel: Add OS info memory interface
  [S390] Use block_sigmask()
  [S390] kernel: Add z/VM LGR detection
  [S390] irq: external interrupt code passing
  [S390] irq: set __ARCH_IRQ_EXIT_IRQS_DISABLED
  [S390] zfcpdump: Implement async sdias event processing
  [S390] Use copy_to_absolute_zero() instead of "stura/sturg"
  [S390] rework idle code
  [S390] rework smp code
  [S390] rename lowcore field
  [S390] Fix gcc 4.6.0 compile warning
parents 48aab2f7 c6da39f2

arch/s390/include/asm/cputime.h

+1 −8
Original line number Diff line number Diff line
@@ -170,24 +170,17 @@ struct s390_idle_data { 
	unsigned int sequence;

	unsigned long long idle_count;

	unsigned long long idle_enter;

	unsigned long long idle_exit;

	unsigned long long idle_time;

	int nohz_delay;

};



DECLARE_PER_CPU(struct s390_idle_data, s390_idle);



void vtime_start_cpu(__u64 int_clock, __u64 enter_timer);

cputime64_t s390_get_idle_time(int cpu);



#define arch_idle_time(cpu) s390_get_idle_time(cpu)



static inline void s390_idle_check(struct pt_regs *regs, __u64 int_clock,

				   __u64 enter_timer)

{

	if (regs->psw.mask & PSW_MASK_WAIT)

		vtime_start_cpu(int_clock, enter_timer);

}



static inline int s390_nohz_delay(int cpu)

{

	return __get_cpu_var(s390_idle).nohz_delay != 0;

arch/s390/include/asm/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ void debug_unregister(debug_info_t* id); 


void debug_set_level(debug_info_t* id, int new_level);



void debug_set_critical(void);

void debug_stop_all(void);



static inline debug_entry_t*

arch/s390/include/asm/hardirq.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#define __ARCH_IRQ_STAT

#define __ARCH_HAS_DO_SOFTIRQ

#define __ARCH_IRQ_EXIT_IRQS_DISABLED



#define HARDIRQ_BITS	8

arch/s390/include/asm/ipl.h

+1 −0
Original line number Diff line number Diff line
@@ -169,5 +169,6 @@ enum diag308_rc { 
extern int diag308(unsigned long subcode, void *addr);

extern void diag308_reset(void);

extern void store_status(void);

extern void lgr_info_log(void);



#endif /* _ASM_S390_IPL_H */

arch/s390/include/asm/irq.h

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ enum interruption_class { 
	NR_IRQS,

};



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

struct ext_code {

	unsigned short subcode;

	unsigned short code;

};



typedef void (*ext_int_handler_t)(struct ext_code, 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);