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

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

Pull ia64 fixes from Tony Luck:
 "Bundle of miscellaneous ia64 fixes for 3.10 merge window."

* tag 'please-pull-misc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  Add size restriction to the kdump documentation
  Fix example error_injection_tool
  Fix build error for numa_clear_node() under IA64
  Fix initialization of CMCI/CMCP interrupts
  Change "select DMAR" to "select INTEL_IOMMU"
  Wrong asm register contraints in the kvm implementation
  Wrong asm register contraints in the futex implementation
  Remove cast for kmalloc return value
  Fix kexec oops when iosapic was removed
  iosapic: fix a minor typo in comments
  Add WB/UC check for early_ioremap
  Fix broken fsys_getppid()
  tiocx: check retval from bus_register()
parents 916bb6d7 797f6a68

Documentation/ia64/err_inject.txt

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ int err_inj() 
			cpu=parameters[i].cpu;

			k = cpu%64;

			j = cpu/64;

			mask[j]=1<<k;

			mask[j] = 1UL << k;



			if (sched_setaffinity(0, MASK_SIZE*8, mask)==-1) {

				perror("Error sched_setaffinity:");

Documentation/kdump/kdump.txt

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ Boot into System Kernel 
   On ia64, 256M@256M is a generous value that typically works.

   The region may be automatically placed on ia64, see the

   dump-capture kernel config option notes above.

   If use sparse memory, the size should be rounded to GRANULE boundaries.



   On s390x, typically use "crashkernel=xxM". The value of xx is dependent

   on the memory consumption of the kdump system. In general this is not

arch/ia64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ config IA64_DIG 


config IA64_DIG_VTD

	bool "DIG+Intel+IOMMU"

	select DMAR

	select INTEL_IOMMU

	select PCI_MSI



config IA64_HP_ZX1

arch/ia64/include/asm/futex.h

+2 −3
Original line number Diff line number Diff line
@@ -106,16 +106,15 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
		return -EFAULT;



	{

		register unsigned long r8 __asm ("r8");

		register unsigned long r8 __asm ("r8") = 0;

		unsigned long prev;

		__asm__ __volatile__(

			"	mf;;					\n"

			"	mov %0=r0				\n"

			"	mov ar.ccv=%4;;				\n"

			"[1:]	cmpxchg4.acq %1=[%2],%3,ar.ccv		\n"

			"	.xdata4 \"__ex_table\", 1b-., 2f-.	\n"

			"[2:]"

			: "=r" (r8), "=r" (prev)

			: "+r" (r8), "=&r" (prev)

			: "r" (uaddr), "r" (newval),

			  "rO" ((long) (unsigned) oldval)

			: "memory");

arch/ia64/include/asm/mca.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ extern unsigned long __per_cpu_mca[NR_CPUS]; 
extern int cpe_vector;

extern int ia64_cpe_irq;

extern void ia64_mca_init(void);

extern void ia64_mca_irq_init(void);

extern void ia64_mca_cpu_init(void *);

extern void ia64_os_mca_dispatch(void);

extern void ia64_os_mca_dispatch_end(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE