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

Commit 92985ef1 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Clean up redudant definitions already defined elsewhere 



Since mis-order issues have been solved, we can cleanup redundant
definitions that already have defaults in <acpi/platform/acenv.h>.

This patch removes redudant environments for __KERNEL__ surrounded code.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 07d83914

arch/ia64/include/asm/acenv.h

+0 −15
Original line number Diff line number Diff line
@@ -17,23 +17,8 @@ 
#define COMPILER_DEPENDENT_INT64	long

#define COMPILER_DEPENDENT_UINT64	unsigned long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_FLUSH_CPU_CACHE()



#ifdef CONFIG_ACPI



static inline int

arch/x86/include/asm/acenv.h

+0 −16
Original line number Diff line number Diff line
@@ -14,22 +14,6 @@ 


#include <asm/special_insns.h>



#define COMPILER_DEPENDENT_INT64   long long

#define COMPILER_DEPENDENT_UINT64  unsigned long long



/*

 * Calling conventions:

 *

 * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)

 * ACPI_EXTERNAL_XFACE      - External ACPI interfaces

 * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces

 * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces

 */

#define ACPI_SYSTEM_XFACE

#define ACPI_EXTERNAL_XFACE

#define ACPI_INTERNAL_XFACE

#define ACPI_INTERNAL_VAR_XFACE



/* Asm macros */



#define ACPI_FLUSH_CPU_CACHE()	wbinvd()

include/acpi/platform/aclinux.h

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


#define ACPI_USE_SYSTEM_CLIBRARY

#define ACPI_USE_DO_WHILE_0

#define ACPI_MUTEX_TYPE             ACPI_BINARY_SEMAPHORE



#ifdef __KERNEL__