leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Joe Perches 2008-03-23 01:03:00 -07:00 committed by Ingo Molnar
parent fad599854e
commit 49cd740bb0
1 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
include/asm-x86/paravirt.h
View File

@ -231,7 +231,8 @@ struct pv_mmu_ops {
void (*set_pte_at)(struct mm_struct *mm, unsigned long addr, void (*set_pte_at)(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pteval); pte_t *ptep, pte_t pteval);
void (*set_pmd)(pmd_t *pmdp, pmd_t pmdval); void (*set_pmd)(pmd_t *pmdp, pmd_t pmdval);
void (*pte_update)(struct mm_struct *mm, unsigned long addr, pte_t *ptep); void (*pte_update)(struct mm_struct *mm, unsigned long addr,
pte_t *ptep);
void (*pte_update_defer)(struct mm_struct *mm, void (*pte_update_defer)(struct mm_struct *mm,
unsigned long addr, pte_t *ptep); unsigned long addr, pte_t *ptep);
@ -246,7 +247,8 @@ struct pv_mmu_ops {
void (*set_pte_atomic)(pte_t *ptep, pte_t pteval); void (*set_pte_atomic)(pte_t *ptep, pte_t pteval);
void (*set_pte_present)(struct mm_struct *mm, unsigned long addr, void (*set_pte_present)(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte); pte_t *ptep, pte_t pte);
void (*pte_clear)(struct mm_struct *mm, unsigned long addr, pte_t *ptep); void (*pte_clear)(struct mm_struct *mm, unsigned long addr,
pte_t *ptep);
void (*pmd_clear)(pmd_t *pmdp); void (*pmd_clear)(pmd_t *pmdp);
#endif /* CONFIG_X86_PAE */ #endif /* CONFIG_X86_PAE */
@ -274,8 +276,7 @@ struct pv_mmu_ops {
/* This contains all the paravirt structures: we get a convenient /* This contains all the paravirt structures: we get a convenient
* number for each function using the offset which we use to indicate * number for each function using the offset which we use to indicate
* what to patch. */ * what to patch. */
struct paravirt_patch_template struct paravirt_patch_template {
{
struct pv_init_ops pv_init_ops; struct pv_init_ops pv_init_ops;
struct pv_time_ops pv_time_ops; struct pv_time_ops pv_time_ops;
struct pv_cpu_ops pv_cpu_ops; struct pv_cpu_ops pv_cpu_ops;
@ -660,32 +661,37 @@ static inline int paravirt_write_msr(unsigned msr, unsigned low, unsigned high)
} }
/* These should all do BUG_ON(_err), but our headers are too tangled. */ /* These should all do BUG_ON(_err), but our headers are too tangled. */
#define rdmsr(msr,val1,val2) do { \ #define rdmsr(msr, val1, val2) \
do { \
int _err; \ int _err; \
u64 _l = paravirt_read_msr(msr, &_err); \ u64 _l = paravirt_read_msr(msr, &_err); \
val1 = (u32)_l; \ val1 = (u32)_l; \
val2 = _l >> 32; \ val2 = _l >> 32; \
} while(0) } while (0)
#define wrmsr(msr,val1,val2) do { \ #define wrmsr(msr, val1, val2) \
do { \
paravirt_write_msr(msr, val1, val2); \ paravirt_write_msr(msr, val1, val2); \
} while(0) } while (0)
#define rdmsrl(msr,val) do { \ #define rdmsrl(msr, val) \
do { \
int _err; \ int _err; \
val = paravirt_read_msr(msr, &_err); \ val = paravirt_read_msr(msr, &_err); \
} while(0) } while (0)
#define wrmsrl(msr,val) wrmsr(msr, (u32)((u64)(val)), ((u64)(val))>>32) #define wrmsrl(msr, val) wrmsr(msr, (u32)((u64)(val)), ((u64)(val))>>32)
#define wrmsr_safe(msr,a,b) paravirt_write_msr(msr, a, b) #define wrmsr_safe(msr, a, b) paravirt_write_msr(msr, a, b)
/* rdmsr with exception handling */ /* rdmsr with exception handling */
#define rdmsr_safe(msr,a,b) ({ \ #define rdmsr_safe(msr, a, b) \
({ \
int _err; \ int _err; \
u64 _l = paravirt_read_msr(msr, &_err); \ u64 _l = paravirt_read_msr(msr, &_err); \
(*a) = (u32)_l; \ (*a) = (u32)_l; \
(*b) = _l >> 32; \ (*b) = _l >> 32; \
_err; }) _err; \
})
static inline u64 paravirt_read_tsc(void) static inline u64 paravirt_read_tsc(void)
@ -693,10 +699,11 @@ static inline u64 paravirt_read_tsc(void)
return PVOP_CALL0(u64, pv_cpu_ops.read_tsc); return PVOP_CALL0(u64, pv_cpu_ops.read_tsc);
} }
#define rdtscl(low) do { \ #define rdtscl(low) \
do { \
u64 _l = paravirt_read_tsc(); \ u64 _l = paravirt_read_tsc(); \
low = (int)_l; \ low = (int)_l; \
} while(0) } while (0)
#define rdtscll(val) (val = paravirt_read_tsc()) #define rdtscll(val) (val = paravirt_read_tsc())
@ -711,11 +718,12 @@ static inline unsigned long long paravirt_read_pmc(int counter)
return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter); return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);
} }
#define rdpmc(counter,low,high) do { \ #define rdpmc(counter, low, high) \
do { \
u64 _l = paravirt_read_pmc(counter); \ u64 _l = paravirt_read_pmc(counter); \
low = (u32)_l; \ low = (u32)_l; \
high = _l >> 32; \ high = _l >> 32; \
} while(0) } while (0)
static inline unsigned long long paravirt_rdtscp(unsigned int *aux) static inline unsigned long long paravirt_rdtscp(unsigned int *aux)
{ {
@ -794,7 +802,8 @@ static inline void set_iopl_mask(unsigned mask)
} }
/* The paravirtualized I/O functions */ /* The paravirtualized I/O functions */
static inline void slow_down_io(void) { static inline void slow_down_io(void)
{
pv_cpu_ops.io_delay(); pv_cpu_ops.io_delay();
#ifdef REALLY_SLOW_IO #ifdef REALLY_SLOW_IO
pv_cpu_ops.io_delay(); pv_cpu_ops.io_delay();