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

Commit 6d8a97af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull misc ia64 build fixes from Tony Luck.

* tag 'please-pull-ia64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts
  [IA64] Rename platform_name to ia64_platform_name
  [IA64] Mark PARAVIRT and KVM as broken
parents f6bcfc9d a1193655

arch/ia64/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ config AUDIT_ARCH 


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.
@@ -138,8 +139,6 @@ config PARAVIRT 
	bool "Enable paravirtualization code"

	depends on PARAVIRT_GUEST

	default y

	bool

	default y

	help

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

	  under a hypervisor, potentially improving performance significantly

arch/ia64/include/asm/atomic.h

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <asm/intrinsics.h>





#define ATOMIC_INIT(i)		((atomic_t) { (i) })

#define ATOMIC64_INIT(i)	((atomic64_t) { (i) })

#define ATOMIC_INIT(i)		{ (i) }

#define ATOMIC64_INIT(i)	{ (i) }



#define atomic_read(v)		(*(volatile int *)&(v)->counter)

#define atomic64_read(v)	(*(volatile long *)&(v)->counter)

arch/ia64/include/asm/machvec.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ extern void machvec_tlb_migrate_finish (struct mm_struct *); 
# ifdef MACHVEC_PLATFORM_HEADER

#  include MACHVEC_PLATFORM_HEADER

# else

#  define platform_name		ia64_mv.name

#  define ia64_platform_name	ia64_mv.name

#  define platform_setup	ia64_mv.setup

#  define platform_cpu_init	ia64_mv.cpu_init

#  define platform_irq_init	ia64_mv.irq_init

arch/ia64/include/asm/machvec_dig.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ extern ia64_mv_setup_t dig_setup; 
 * platform's machvec structure.  When compiling a non-generic kernel,

 * the macros are used directly.

 */

#define platform_name		"dig"

#define ia64_platform_name	"dig"

#define platform_setup		dig_setup



#endif /* _ASM_IA64_MACHVEC_DIG_h */

arch/ia64/include/asm/machvec_dig_vtd.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ extern ia64_mv_dma_init pci_iommu_alloc; 
 * platform's machvec structure.  When compiling a non-generic kernel,

 * the macros are used directly.

 */

#define platform_name				"dig_vtd"

#define ia64_platform_name			"dig_vtd"

#define platform_setup				dig_setup

#define platform_dma_init			pci_iommu_alloc