Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (492559af) · Commits · 戴 / test

arch/ia64/hp/common/sba_iommu.c

+18 −2

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include <linux/efi.h>
		#include <linux/nodemask.h>
		#include <linux/bitops.h> /* hweight64() */
		#include <linux/crash_dump.h>

		#include <asm/delay.h> /* ia64_get_itc() */
		#include <asm/io.h>
		@@ -43,6 +44,8 @@

		#include <asm/acpi-ext.h>

		extern int swiotlb_late_init_with_default_size (size_t size);

		#define PFX "IOC: "

		/*
		@@ -2026,11 +2029,24 @@ sba_init(void)
		if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb"))
		return 0;

		#if defined(CONFIG_IA64_GENERIC) && defined(CONFIG_CRASH_DUMP)
		/* If we are booting a kdump kernel, the sba_iommu will
		* cause devices that were not shutdown properly to MCA
		* as soon as they are turned back on. Our only option for
		* a successful kdump kernel boot is to use the swiotlb.
		*/
		if (elfcorehdr_addr < ELFCORE_ADDR_MAX) {
		if (swiotlb_late_init_with_default_size(64 * (1<<20)) != 0)
		panic("Unable to initialize software I/O TLB:"
		" Try machvec=dig boot option");
		machvec_init("dig");
		return 0;
		}
		#endif

		acpi_bus_register_driver(&acpi_sba_ioc_driver);
		if (!ioc_list) {
		#ifdef CONFIG_IA64_GENERIC
		extern int swiotlb_late_init_with_default_size (size_t size);

		/*
		* If we didn't find something sba_iommu can claim, we
		* need to setup the swiotlb and switch to the dig machvec.

+0 −5

Original line number	Diff line number	Diff line
		@@ -329,11 +329,6 @@ sys_fw_init (const char *args, int arglen)
		strcpy(sal_systab->product_id, "HP-simulator");
		#endif

		#ifdef CONFIG_IA64_SDV
		strcpy(sal_systab->oem_id, "Intel");
		strcpy(sal_systab->product_id, "SDV");
		#endif

		/* fill in an entry point: */
		sal_ed->type = SAL_DESC_ENTRY_POINT;
		sal_ed->pal_proc = __pa(pal_desc[0]);

+0 −4

Original line number	Diff line number	Diff line
		@@ -36,10 +36,6 @@
		#include <asm/hw_irq.h>
		#include <asm/uaccess.h>

		#ifdef CONFIG_KDB
		# include <linux/kdb.h>
		#endif

		#undef SIMSERIAL_DEBUG /* define this to get some debug information */

		#define KEYBOARD_INTR 3 /* must match with simulator! */

+3 −1

Original line number	Diff line number	Diff line
		@@ -247,6 +247,9 @@ ENTRY(fsys_gettimeofday)
		.time_redo:
		.pred.rel.mutex p8,p9,p10
		ld4.acq r28 = [r29] // xtime_lock.sequence. Must come first for locking purposes
		;;
		and r28 = ~1,r28 // Make sequence even to force retry if odd
		;;
		(p8) mov r2 = ar.itc // CPU_TIMER. 36 clocks latency!!!
		add r22 = IA64_TIME_INTERPOLATOR_LAST_COUNTER_OFFSET,r20
		(p9) ld8 r2 = [r30] // readq(ti->address). Could also have latency issues..
		@@ -284,7 +287,6 @@ EX(.fail_efault, probe.w.fault r31, 3) // This takes 5 cycles and we have spare
		(p15) ld8 r17 = [r19],-IA64_TIMESPEC_TV_NSEC_OFFSET
		(p7) cmp.ne p7,p0 = r25,r3 // if cmpxchg not successful redo
		// simulate tbit.nz.or p7,p0 = r28,0
		and r28 = ~1,r28 // Make sequence even to force retry if odd
		getf.sig r2 = f8
		mf
		add r8 = r8,r18 // Add time interpolator offset

+2 −1

Original line number	Diff line number	Diff line
		@@ -750,9 +750,10 @@ sn_hwperf_ioctl(struct inode in, struct file fp, u32 op, u64 arg)
		goto error;
		} else
		if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
		int cpuobj_index = 0;

		memset(p, 0, a.sz);
		for (i = 0; i < nobj; i++) {
		int cpuobj_index = 0;
		if (!SN_HWPERF_IS_NODE(objs + i))
		continue;
		node = sn_hwperf_obj_to_cnode(objs + i);