Commit efdfce2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux 

Pull ia64 paravirt removal from Tony Luck:
 "Nobody cares about paravirtualization on ia64 anymore"

* tag 'please-pull-paravirt' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: remove paravirt code
parents df687709 e55645ec

arch/ia64/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -137,29 +137,6 @@ config AUDIT_ARCH 
	bool

	default y



menuconfig PARAVIRT_GUEST

	bool "Paravirtualized guest support"

	depends on BROKEN

	help

	  Say Y here to get to see options related to running Linux under

	  various hypervisors.  This option alone does not add any kernel code.



	  If you say N, all options in this submenu will be skipped and disabled.



if PARAVIRT_GUEST



config PARAVIRT

	bool "Enable paravirtualization code"

	depends on PARAVIRT_GUEST

	default y

	help

	  This changes the kernel so it can modify itself when it is run

	  under a hypervisor, potentially improving performance significantly

	  over full virtualization.  However, when run without a hypervisor

	  the kernel is theoretically slower and slightly larger.



endif



choice

	prompt "System type"

	default IA64_GENERIC

arch/ia64/include/asm/hw_irq.h

+0 −8
Original line number Diff line number Diff line
@@ -15,11 +15,7 @@ 
#include <asm/ptrace.h>

#include <asm/smp.h>



#ifndef CONFIG_PARAVIRT

typedef u8 ia64_vector;

#else

typedef u16 ia64_vector;

#endif



/*

 * 0 special
@@ -114,15 +110,11 @@ DECLARE_PER_CPU(int[IA64_NUM_VECTORS], vector_irq); 


extern struct irq_chip irq_type_ia64_lsapic;	/* CPU-internal interrupt controller */



#ifdef CONFIG_PARAVIRT_GUEST

#include <asm/paravirt.h>

#else

#define ia64_register_ipi	ia64_native_register_ipi

#define assign_irq_vector	ia64_native_assign_irq_vector

#define free_irq_vector		ia64_native_free_irq_vector

#define register_percpu_irq	ia64_native_register_percpu_irq

#define ia64_resend_irq		ia64_native_resend_irq

#endif



extern void ia64_native_register_ipi(void);

extern int bind_irq_vector(int irq, int vector, cpumask_t domain);

arch/ia64/include/asm/intrinsics.h

+0 −13
Original line number Diff line number Diff line
@@ -7,19 +7,6 @@ 
#ifndef _ASM_IA64_INTRINSICS_H

#define _ASM_IA64_INTRINSICS_H



#include <asm/paravirt_privop.h>

#include <uapi/asm/intrinsics.h>



#ifndef __ASSEMBLY__

#if defined(CONFIG_PARAVIRT)

# undef IA64_INTRINSIC_API

# undef IA64_INTRINSIC_MACRO

# ifdef ASM_SUPPORTED

#  define IA64_INTRINSIC_API(name)	paravirt_ ## name

# else

#  define IA64_INTRINSIC_API(name)	pv_cpu_ops.name

# endif

#define IA64_INTRINSIC_MACRO(name)	paravirt_ ## name

#endif

#endif /* !__ASSEMBLY__ */

#endif /* _ASM_IA64_INTRINSICS_H */

arch/ia64/include/asm/iosapic.h

+0 −4
Original line number Diff line number Diff line
@@ -55,14 +55,10 @@ 


#define NR_IOSAPICS			256



#ifdef CONFIG_PARAVIRT_GUEST

#include <asm/paravirt.h>

#else

#define iosapic_pcat_compat_init	ia64_native_iosapic_pcat_compat_init

#define __iosapic_read			__ia64_native_iosapic_read

#define __iosapic_write			__ia64_native_iosapic_write

#define iosapic_get_irq_chip		ia64_native_iosapic_get_irq_chip

#endif



extern void __init ia64_native_iosapic_pcat_compat_init(void);

extern struct irq_chip *ia64_native_iosapic_get_irq_chip(unsigned long trigger);

arch/ia64/include/asm/module.h

+0 −6
Original line number Diff line number Diff line
@@ -18,12 +18,6 @@ struct mod_arch_specific { 
	struct elf64_shdr *got;		/* global offset table */

	struct elf64_shdr *opd;		/* official procedure descriptors */

	struct elf64_shdr *unwind;	/* unwind-table section */

#ifdef CONFIG_PARAVIRT

	struct elf64_shdr *paravirt_bundles;

					/* paravirt_alt_bundle_patch table */

	struct elf64_shdr *paravirt_insts;

					/* paravirt_alt_inst_patch table */

#endif

	unsigned long gp;		/* global-pointer for module */



	void *core_unw_table;		/* core unwind-table cookie returned by unwinder */