Skip to content

L
linux
Commit 9969b440 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files
Options

include/asm-x86/mtrr.h: checkpatch cleanups - formatting only 

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent abb0ade0
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 34 deletions
include/asm-x86/mtrr.h
View file @ 9969b440
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
#define MTRR_IOCTL_BASE 'M' #define MTRR_IOCTL_BASE 'M'
struct mtrr_sentry struct mtrr_sentry {
{
unsigned long base; /* Base address */ unsigned long base; /* Base address */
unsigned int size; /* Size of region */ unsigned int size; /* Size of region */
unsigned int type; /* Type of region */ unsigned int type; /* Type of region */
...@@ -41,8 +40,7 @@ struct mtrr_sentry ...@@ -41,8 +40,7 @@ struct mtrr_sentry
will break. */ will break. */
#ifdef __i386__ #ifdef __i386__
struct mtrr_gentry struct mtrr_gentry {
{
unsigned int regnum; /* Register number */ unsigned int regnum; /* Register number */
unsigned long base; /* Base address */ unsigned long base; /* Base address */
unsigned int size; /* Size of region */ unsigned int size; /* Size of region */
...@@ -51,8 +49,7 @@ struct mtrr_gentry ...@@ -51,8 +49,7 @@ struct mtrr_gentry
#else /* __i386__ */ #else /* __i386__ */
struct mtrr_gentry struct mtrr_gentry {
{
unsigned long base; /* Base address */ unsigned long base; /* Base address */
unsigned int size; /* Size of region */ unsigned int size; /* Size of region */
unsigned int regnum; /* Register number */ unsigned int regnum; /* Register number */
...@@ -89,12 +86,12 @@ struct mtrr_gentry ...@@ -89,12 +86,12 @@ struct mtrr_gentry
extern u8 mtrr_type_lookup(u64 addr, u64 end); extern u8 mtrr_type_lookup(u64 addr, u64 end);
extern void mtrr_save_fixed_ranges(void *); extern void mtrr_save_fixed_ranges(void *);
extern void mtrr_save_state(void); extern void mtrr_save_state(void);
extern int mtrr_add (unsigned long base, unsigned long size, extern int mtrr_add(unsigned long base, unsigned long size,
unsigned int type, bool increment); unsigned int type, bool increment);
extern int mtrr_add_page (unsigned long base, unsigned long size, extern int mtrr_add_page(unsigned long base, unsigned long size,
unsigned int type, bool increment); unsigned int type, bool increment);
extern int mtrr_del (int reg, unsigned long base, unsigned long size); extern int mtrr_del(int reg, unsigned long base, unsigned long size);
extern int mtrr_del_page (int reg, unsigned long base, unsigned long size); extern int mtrr_del_page(int reg, unsigned long base, unsigned long size);
extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi); extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
extern void mtrr_ap_init(void); extern void mtrr_ap_init(void);
extern void mtrr_bp_init(void); extern void mtrr_bp_init(void);
...@@ -110,23 +107,21 @@ static inline u8 mtrr_type_lookup(u64 addr, u64 end) ...@@ -110,23 +107,21 @@ static inline u8 mtrr_type_lookup(u64 addr, u64 end)
} }
#define mtrr_save_fixed_ranges(arg) do {} while (0) #define mtrr_save_fixed_ranges(arg) do {} while (0)
#define mtrr_save_state() do {} while (0) #define mtrr_save_state() do {} while (0)
static __inline__ int mtrr_add (unsigned long base, unsigned long size, static inline int mtrr_add(unsigned long base, unsigned long size,
unsigned int type, bool increment) unsigned int type, bool increment)
{ {
return -ENODEV; return -ENODEV;
} }
static __inline__ int mtrr_add_page (unsigned long base, unsigned long size, static inline int mtrr_add_page(unsigned long base, unsigned long size,
unsigned int type, bool increment) unsigned int type, bool increment)
{ {
return -ENODEV; return -ENODEV;
} }
static __inline__ int mtrr_del (int reg, unsigned long base, static inline int mtrr_del(int reg, unsigned long base, unsigned long size)
unsigned long size)
{ {
return -ENODEV; return -ENODEV;
} }
static __inline__ int mtrr_del_page (int reg, unsigned long base, static inline int mtrr_del_page(int reg, unsigned long base, unsigned long size)
unsigned long size)
{ {
return -ENODEV; return -ENODEV;
} }
...@@ -134,7 +129,9 @@ static inline int mtrr_trim_uncached_memory(unsigned long end_pfn) ...@@ -134,7 +129,9 @@ static inline int mtrr_trim_uncached_memory(unsigned long end_pfn)
{ {
return 0; return 0;
} }
static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;} static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi)
{
}
#define mtrr_ap_init() do {} while (0) #define mtrr_ap_init() do {} while (0)
#define mtrr_bp_init() do {} while (0) #define mtrr_bp_init() do {} while (0)
...@@ -143,15 +140,13 @@ static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;} ...@@ -143,15 +140,13 @@ static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {;}
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#include <linux/compat.h> #include <linux/compat.h>
struct mtrr_sentry32 struct mtrr_sentry32 {
{
compat_ulong_t base; /* Base address */ compat_ulong_t base; /* Base address */
compat_uint_t size; /* Size of region */ compat_uint_t size; /* Size of region */
compat_uint_t type; /* Type of region */ compat_uint_t type; /* Type of region */
}; };
struct mtrr_gentry32 struct mtrr_gentry32 {
{
compat_ulong_t regnum; /* Register number */ compat_ulong_t regnum; /* Register number */
compat_uint_t base; /* Base address */ compat_uint_t base; /* Base address */
compat_uint_t size; /* Size of region */ compat_uint_t size; /* Size of region */
...@@ -160,16 +155,17 @@ struct mtrr_gentry32 ...@@ -160,16 +155,17 @@ struct mtrr_gentry32
#define MTRR_IOCTL_BASE 'M' #define MTRR_IOCTL_BASE 'M'
#define MTRRIOC32_ADD_ENTRY _IOW(MTRR_IOCTL_BASE, 0, struct mtrr_sentry32) #define MTRRIOC32_ADD_ENTRY _IOW(MTRR_IOCTL_BASE, 0, struct mtrr_sentry32)
#define MTRRIOC32_SET_ENTRY _IOW(MTRR_IOCTL_BASE, 1, struct mtrr_sentry32) #define MTRRIOC32_SET_ENTRY _IOW(MTRR_IOCTL_BASE, 1, struct mtrr_sentry32)
#define MTRRIOC32_DEL_ENTRY _IOW(MTRR_IOCTL_BASE, 2, struct mtrr_sentry32) #define MTRRIOC32_DEL_ENTRY _IOW(MTRR_IOCTL_BASE, 2, struct mtrr_sentry32)
#define MTRRIOC32_GET_ENTRY _IOWR(MTRR_IOCTL_BASE, 3, struct mtrr_gentry32) #define MTRRIOC32_GET_ENTRY _IOWR(MTRR_IOCTL_BASE, 3, struct mtrr_gentry32)
#define MTRRIOC32_KILL_ENTRY _IOW(MTRR_IOCTL_BASE, 4, struct mtrr_sentry32) #define MTRRIOC32_KILL_ENTRY _IOW(MTRR_IOCTL_BASE, 4, struct mtrr_sentry32)
#define MTRRIOC32_ADD_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 5, struct mtrr_sentry32) #define MTRRIOC32_ADD_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 5, struct mtrr_sentry32)
#define MTRRIOC32_SET_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 6, struct mtrr_sentry32) #define MTRRIOC32_SET_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 6, struct mtrr_sentry32)
#define MTRRIOC32_DEL_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 7, struct mtrr_sentry32) #define MTRRIOC32_DEL_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 7, struct mtrr_sentry32)
#define MTRRIOC32_GET_PAGE_ENTRY _IOWR(MTRR_IOCTL_BASE, 8, struct mtrr_gentry32) #define MTRRIOC32_GET_PAGE_ENTRY _IOWR(MTRR_IOCTL_BASE, 8, struct mtrr_gentry32)
#define MTRRIOC32_KILL_PAGE_ENTRY _IOW(MTRR_IOCTL_BASE, 9, struct mtrr_sentry32) #define MTRRIOC32_KILL_PAGE_ENTRY \
_IOW(MTRR_IOCTL_BASE, 9, struct mtrr_sentry32)
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7