Commit 8a999410 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: cleanup acpi_32/64.h 



Fix coding style to get a readable diff

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ae9d983b

include/asm-x86/acpi_32.h

+14 −21
Original line number Diff line number Diff line
@@ -24,11 +24,8 @@ 
#ifndef _ASM_ACPI_H

#define _ASM_ACPI_H



#ifdef __KERNEL__



#include <acpi/pdc_intel.h>



#include <asm/system.h>		/* defines cmpxchg */

#include <asm/numa.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long
@@ -87,6 +84,9 @@ extern int acpi_strict; 
extern int acpi_disabled;

extern int acpi_ht;

extern int acpi_pci_disabled;

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



static inline void disable_acpi(void)

{

	acpi_disabled = 1;
@@ -100,11 +100,6 @@ static inline void disable_acpi(void) 


extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);



#ifdef CONFIG_X86_IO_APIC

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;

#endif



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }

static inline void acpi_disable_pci(void)

{
@@ -134,6 +129,4 @@ static inline void disable_acpi(void) { } 


#define ARCH_HAS_POWER_INIT	1



#endif /*__KERNEL__*/



#endif /*_ASM_ACPI_H*/

include/asm-x86/acpi_64.h

+17 −24
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#ifndef _ASM_ACPI_H

#define _ASM_ACPI_H



#ifdef __KERNEL__



#include <acpi/pdc_intel.h>

#include <asm/numa.h>
@@ -84,8 +82,11 @@ extern int acpi_ioapic; 
extern int acpi_noirq;

extern int acpi_strict;

extern int acpi_disabled;

extern int acpi_pci_disabled;

extern int acpi_ht;

extern int acpi_pci_disabled;

extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



static inline void disable_acpi(void)

{

	acpi_disabled = 1;
@@ -98,6 +99,7 @@ static inline void disable_acpi(void) 
#define FIX_ACPI_PAGES 4



extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);



static inline void acpi_noirq_set(void) { acpi_noirq = 1; }

static inline void acpi_disable_pci(void)

{
@@ -124,19 +126,12 @@ static inline void acpi_disable_pci(void) { } 


#endif /* !CONFIG_ACPI */



extern int acpi_numa;

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)



extern int acpi_disabled;

extern int acpi_pci_disabled;



#define ARCH_HAS_POWER_INIT	1



extern int acpi_skip_timer_override;

extern int acpi_use_timer_override;



#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,

				   int num_nodes);

#else
@@ -146,6 +141,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes, 
}

#endif



#endif /*__KERNEL__*/



#endif /*_ASM_ACPI_H*/