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

Commit d819c49d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/urgent

parents f18f982a 9bedbcb2

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ tags 
TAGS

vmlinux*

!vmlinux.lds.S

!vmlinux.lds.h

System.map

Module.markers

Module.symvers

arch/ia64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ core-$(CONFIG_IA64_GENERIC) += arch/ia64/dig/ 
core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/

core-$(CONFIG_IA64_SGI_SN2)	+= arch/ia64/sn/

core-$(CONFIG_IA64_SGI_UV)	+= arch/ia64/uv/

core-$(CONFIG_KVM) 		+= arch/ia64/kvm/



drivers-$(CONFIG_PCI)		+= arch/ia64/pci/

arch/ia64/kernel/perfmon.c

+5 −5
Original line number Diff line number Diff line
@@ -1864,11 +1864,6 @@ pfm_flush(struct file *filp, fl_owner_t id) 
	 * invoked after, it will find an empty queue and no

	 * signal will be sent. In both case, we are safe

	 */

	if (filp->f_flags & FASYNC) {

		DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));

		pfm_do_fasync (-1, filp, ctx, 0);

	}



	PROTECT_CTX(ctx, flags);



	state     = ctx->ctx_state;
@@ -1999,6 +1994,11 @@ pfm_close(struct inode *inode, struct file *filp) 
		return -EBADF;

	}



	if (filp->f_flags & FASYNC) {

		DPRINT(("cleaning up async_queue=%p\n", ctx->ctx_async_queue));

		pfm_do_fasync(-1, filp, ctx, 0);

	}



	PROTECT_CTX(ctx, flags);



	state     = ctx->ctx_state;

arch/ia64/kernel/sal.c

+3 −4
Original line number Diff line number Diff line
@@ -252,11 +252,10 @@ check_sal_cache_flush (void) 
	local_irq_save(flags);



	/*

	 * Schedule a timer interrupt, wait until it's reported, and see if

	 * SAL_CACHE_FLUSH drops it.

	 * Send ourselves a timer interrupt, wait until it's reported, and see

	 * if SAL_CACHE_FLUSH drops it.

	 */

	ia64_set_itv(IA64_TIMER_VECTOR);

	ia64_set_itm(ia64_get_itc() + 1000);

	platform_send_ipi(cpu, IA64_TIMER_VECTOR, IA64_IPI_DM_INT, 0);



	while (!ia64_get_irr(IA64_TIMER_VECTOR))

		cpu_relax();

arch/ia64/uv/kernel/setup.c

+12 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
DEFINE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);

EXPORT_PER_CPU_SYMBOL_GPL(__uv_hub_info);



#ifdef CONFIG_IA64_SGI_UV

int sn_prom_type;

#endif



struct redir_addr {

	unsigned long redirect;
@@ -64,6 +67,15 @@ void __init uv_setup(char **cmdline_p) 
		m_n_config.s.m_skt = 37;

		m_n_config.s.n_skt = 0;

		mmr_base = 0;

#if 0

		/* Need BIOS calls - TDB */

		if (!ia64_sn_is_fake_prom())

			sn_prom_type = 1;

		else

#endif

			sn_prom_type = 2;

		printk(KERN_INFO "Running on medusa with %s PROM\n",

					(sn_prom_type == 1) ? "real" : "fake");

	} else {

		get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size);

		node_id.v = uv_read_local_mmr(UVH_NODE_ID);