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

Commit f63c2f24 authored by Tej's avatar Tej Committed by Ingo Molnar
Browse files

xen: whitespace/checkpatch cleanup 



Impact: cleanup

Signed-off-by: default avatarTej <bewith.tej@gmail.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1bda7128

arch/x86/xen/enlighten.c

+9 −7
Original line number Diff line number Diff line
@@ -1514,7 +1514,8 @@ static void convert_pfn_mfn(void *v) 
 * of the physical mapping once some sort of allocator has been set

 * up.

 */

static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)

static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,

						unsigned long max_pfn)

{

	pud_t *l3;

	pmd_t *l2;
@@ -1577,7 +1578,8 @@ static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pf 
#else	/* !CONFIG_X86_64 */

static pmd_t level2_kernel_pgt[PTRS_PER_PMD] __page_aligned_bss;



static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)

static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,

						unsigned long max_pfn)

{

	pmd_t *kernel_pmd;

arch/x86/xen/mmu.c

+10 −7
Original line number Diff line number Diff line
@@ -407,7 +407,8 @@ void xen_set_pte_at(struct mm_struct *mm, unsigned long addr, 
		preempt_enable();

}



pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

pte_t xen_ptep_modify_prot_start(struct mm_struct *mm,

				 unsigned long addr, pte_t *ptep)

{

	/* Just return the pte as-is.  We preserve the bits on commit */

	return *ptep;
@@ -878,7 +879,8 @@ static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd) 


		if (user_pgd) {

			xen_pin_page(mm, virt_to_page(user_pgd), PT_PGD);

			xen_do_pin(MMUEXT_PIN_L4_TABLE, PFN_DOWN(__pa(user_pgd)));

			xen_do_pin(MMUEXT_PIN_L4_TABLE,

				   PFN_DOWN(__pa(user_pgd)));

		}

	}

#else /* CONFIG_X86_32 */
@@ -993,7 +995,8 @@ static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd) 
		pgd_t *user_pgd = xen_get_user_pgd(pgd);



		if (user_pgd) {

			xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(user_pgd)));

			xen_do_pin(MMUEXT_UNPIN_TABLE,

				   PFN_DOWN(__pa(user_pgd)));

			xen_unpin_page(mm, virt_to_page(user_pgd), PT_PGD);

		}

	}

arch/x86/xen/multicalls.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void xen_mc_flush(void) 
			       ret, smp_processor_id());

			dump_stack();

			for (i = 0; i < b->mcidx; i++) {

				printk("  call %2d/%d: op=%lu arg=[%lx] result=%ld\n",

				printk(KERN_DEBUG "  call %2d/%d: op=%lu arg=[%lx] result=%ld\n",

				       i+1, b->mcidx,

				       b->debug[i].op,

				       b->debug[i].args[0],

arch/x86/xen/setup.c

+5 −4
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
/* These are code, but not functions.  Defined in entry.S */

extern const char xen_hypervisor_callback[];

extern const char xen_failsafe_callback[];

extern void xen_sysenter_target(void);

extern void xen_syscall_target(void);

extern void xen_syscall32_target(void);





/**
@@ -110,7 +113,6 @@ static __cpuinit int register_callback(unsigned type, const void *func) 


void __cpuinit xen_enable_sysenter(void)

{

	extern void xen_sysenter_target(void);

	int ret;

	unsigned sysenter_feature;
@@ -132,8 +134,6 @@ void __cpuinit xen_enable_syscall(void) 
{

#ifdef CONFIG_X86_64

	int ret;

	extern void xen_syscall_target(void);

	extern void xen_syscall32_target(void);



	ret = register_callback(CALLBACKTYPE_syscall, xen_syscall_target);

	if (ret != 0) {
@@ -160,7 +160,8 @@ void __init xen_arch_setup(void) 
	HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_writable_pagetables);



	if (!xen_feature(XENFEAT_auto_translated_physmap))

		HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3);

		HYPERVISOR_vm_assist(VMASST_CMD_enable,

				     VMASST_TYPE_pae_extended_cr3);



	if (register_callback(CALLBACKTYPE_event, xen_hypervisor_callback) ||

	    register_callback(CALLBACKTYPE_failsafe, xen_failsafe_callback))