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

Commit 6d60cd53 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify nmi_32.h and nmi_64.h 



Two more files goes away. nmi_64.h and nmi_32.h gives birth
to nmi.h

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e32ede19

arch/x86/kernel/nmi_32.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static __init void nmi_cpu_busy(void *data) 
}

#endif



static int __init check_nmi_watchdog(void)

int __init check_nmi_watchdog(void)

{

	unsigned int *prev_nmi_count;

	int cpu;

include/asm-x86/nmi.h

+89 −3
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "nmi_32.h"

#ifndef _ASM_X86_NMI_H_

#define _ASM_X86_NMI_H_



#include <linux/pm.h>

#include <asm/irq.h>

#include <asm/io.h>



#ifdef ARCH_HAS_NMI_WATCHDOG



/**

 * do_nmi_callback

 *

 * Check to see if a callback exists and execute it.  Return 1

 * if the handler exists and was handled successfully.

 */

int do_nmi_callback(struct pt_regs *regs, int cpu);



#ifdef CONFIG_PM



/** Replace the PM callback routine for NMI. */

struct pm_dev *set_nmi_pm_callback(pm_callback callback);



/** Unset the PM callback routine back to the default. */

void unset_nmi_pm_callback(struct pm_dev *dev);



#else

# include "nmi_64.h"



static inline struct pm_dev *set_nmi_pm_callback(pm_callback callback)

{

	return 0;

}



static inline void unset_nmi_pm_callback(struct pm_dev *dev)

{

}



#endif /* CONFIG_PM */



#ifdef CONFIG_X86_64

extern void default_do_nmi(struct pt_regs *);

extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);

#endif



extern int check_nmi_watchdog(void);

extern int nmi_watchdog_enabled;

extern int unknown_nmi_panic;

extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int avail_to_resrv_perfctr_nmi(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

extern int reserve_evntsel_nmi(unsigned int);

extern void release_evntsel_nmi(unsigned int);

extern void nmi_watchdog_default(void);



extern void setup_apic_nmi_watchdog(void *);

extern void stop_apic_nmi_watchdog(void *);

extern void disable_timer_nmi_watchdog(void);

extern void enable_timer_nmi_watchdog(void);

extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason);



extern atomic_t nmi_active;

extern unsigned int nmi_watchdog;

#define NMI_DISABLED    -1

#define NMI_NONE	0

#define NMI_IO_APIC	1

#define NMI_LOCAL_APIC	2

#define NMI_INVALID	3

#define NMI_DEFAULT	NMI_DISABLED



struct ctl_table;

struct file;

extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,

			void __user *, size_t *, loff_t *);

extern int unknown_nmi_panic;



void __trigger_all_cpu_backtrace(void);

#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()



#endif



void lapic_watchdog_stop(void);

int lapic_watchdog_init(unsigned nmi_hz);

int lapic_wd_event(unsigned nmi_hz);

unsigned lapic_adjust_nmi_hz(unsigned hz);

int lapic_watchdog_ok(void);

void disable_lapic_nmi_watchdog(void);

void enable_lapic_nmi_watchdog(void);

void stop_nmi(void);

void restart_nmi(void);



#endif

include/asm-x86/nmi_32.h

deleted100644 → 0
+0 −61
Original line number Diff line number Diff line 
#ifndef ASM_NMI_H

#define ASM_NMI_H



#include <linux/pm.h>

#include <asm/irq.h>



#ifdef ARCH_HAS_NMI_WATCHDOG



/**

 * do_nmi_callback

 *

 * Check to see if a callback exists and execute it.  Return 1

 * if the handler exists and was handled successfully.

 */

int do_nmi_callback(struct pt_regs *regs, int cpu);



extern int nmi_watchdog_enabled;

extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int avail_to_resrv_perfctr_nmi(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

extern int reserve_evntsel_nmi(unsigned int);

extern void release_evntsel_nmi(unsigned int);



extern void setup_apic_nmi_watchdog (void *);

extern void stop_apic_nmi_watchdog (void *);

extern void disable_timer_nmi_watchdog(void);

extern void enable_timer_nmi_watchdog(void);

extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);



extern atomic_t nmi_active;

extern unsigned int nmi_watchdog;

#define NMI_DISABLED    -1

#define NMI_NONE	0

#define NMI_IO_APIC	1

#define NMI_LOCAL_APIC	2

#define NMI_INVALID	3

#define NMI_DEFAULT	NMI_DISABLED



struct ctl_table;

struct file;

extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,

			void __user *, size_t *, loff_t *);

extern int unknown_nmi_panic;



void __trigger_all_cpu_backtrace(void);

#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()



#endif



void lapic_watchdog_stop(void);

int lapic_watchdog_init(unsigned nmi_hz);

int lapic_wd_event(unsigned nmi_hz);

unsigned lapic_adjust_nmi_hz(unsigned hz);

int lapic_watchdog_ok(void);

void disable_lapic_nmi_watchdog(void);

void enable_lapic_nmi_watchdog(void);

void stop_nmi(void);

void restart_nmi(void);



#endif /* ASM_NMI_H */

include/asm-x86/nmi_64.h

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
#ifndef ASM_NMI_H

#define ASM_NMI_H



#include <linux/pm.h>

#include <asm/io.h>

 

/**

 * do_nmi_callback

 *

 * Check to see if a callback exists and execute it.  Return 1

 * if the handler exists and was handled successfully.

 */

int do_nmi_callback(struct pt_regs *regs, int cpu);



#ifdef CONFIG_PM

 

/** Replace the PM callback routine for NMI. */

struct pm_dev * set_nmi_pm_callback(pm_callback callback);



/** Unset the PM callback routine back to the default. */

void unset_nmi_pm_callback(struct pm_dev * dev);



#else



static inline struct pm_dev * set_nmi_pm_callback(pm_callback callback)

{

	return 0;

} 

 

static inline void unset_nmi_pm_callback(struct pm_dev * dev)

{

}



#endif /* CONFIG_PM */

 

extern void default_do_nmi(struct pt_regs *);

extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);



extern int unknown_nmi_panic;

extern int nmi_watchdog_enabled;



extern int check_nmi_watchdog(void);

extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int avail_to_resrv_perfctr_nmi(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

extern int reserve_evntsel_nmi(unsigned int);

extern void release_evntsel_nmi(unsigned int);



extern void setup_apic_nmi_watchdog (void *);

extern void stop_apic_nmi_watchdog (void *);

extern void disable_timer_nmi_watchdog(void);

extern void enable_timer_nmi_watchdog(void);

extern int nmi_watchdog_tick (struct pt_regs * regs, unsigned reason);



extern void nmi_watchdog_default(void);



extern atomic_t nmi_active;

extern unsigned int nmi_watchdog;

#define NMI_DISABLED    -1

#define NMI_NONE	0

#define NMI_IO_APIC	1

#define NMI_LOCAL_APIC	2

#define NMI_INVALID	3

#define NMI_DEFAULT	NMI_DISABLED



struct ctl_table;

struct file;

extern int proc_nmi_enabled(struct ctl_table *, int , struct file *,

			void __user *, size_t *, loff_t *);



extern int unknown_nmi_panic;



void __trigger_all_cpu_backtrace(void);

#define trigger_all_cpu_backtrace() __trigger_all_cpu_backtrace()





void lapic_watchdog_stop(void);

int lapic_watchdog_init(unsigned nmi_hz);

int lapic_wd_event(unsigned nmi_hz);

unsigned lapic_adjust_nmi_hz(unsigned hz);

int lapic_watchdog_ok(void);

void disable_lapic_nmi_watchdog(void);

void enable_lapic_nmi_watchdog(void);

void stop_nmi(void);

void restart_nmi(void);



#endif /* ASM_NMI_H */