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

Commit 3ce2a0bc authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core 



Conflicts:
	tools/perf/util/python.c

Merge reason: resolve the conflict with perf/urgent.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents aef29bf2 aa4a2218

Documentation/kernel-parameters.txt

+4 −1
Original line number Diff line number Diff line
@@ -999,7 +999,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			With this option on every unmap_single operation will

			result in a hardware IOTLB flush operation as opposed

			to batching them for performance.



		sp_off [Default Off]

			By default, super page will be supported if Intel IOMMU

			has the capability. With this option, super page will

			not be supported.

	intremap=	[X86-64, Intel-IOMMU]

			Format: { on (default) | off | nosid }

			on	enable Interrupt Remapping (default)

Documentation/virtual/lguest/Makefile

+1 −1
Original line number Diff line number Diff line 
# This creates the demonstration utility "lguest" which runs a Linux guest.

# Missing headers?  Add "-I../../include -I../../arch/x86/include"

# Missing headers?  Add "-I../../../include -I../../../arch/x86/include"

CFLAGS:=-m32 -Wall -Wmissing-declarations -Wmissing-prototypes -O3 -U_FORTIFY_SOURCE



all: lguest

Documentation/virtual/lguest/lguest.c

+2 −20
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include <linux/virtio_rng.h>

#include <linux/virtio_ring.h>

#include <asm/bootparam.h>

#include "../../include/linux/lguest_launcher.h"

#include "../../../include/linux/lguest_launcher.h"

/*L:110

 * We can ignore the 42 include files we need for this program, but I do want

 * to draw attention to the use of kernel-style types.
@@ -135,9 +135,6 @@ struct device { 
	/* Is it operational */

	bool running;



	/* Does Guest want an intrrupt on empty? */

	bool irq_on_empty;



	/* Device-specific data. */

	void *priv;

};
@@ -637,9 +634,6 @@ static void trigger_irq(struct virtqueue *vq) 


	/* If they don't want an interrupt, don't send one... */

	if (vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT) {

		/* ... unless they've asked us to force one on empty. */

		if (!vq->dev->irq_on_empty

		    || lg_last_avail(vq) != vq->vring.avail->idx)

		return;

	}
@@ -1057,15 +1051,6 @@ static void create_thread(struct virtqueue *vq) 
	close(vq->eventfd);

}



static bool accepted_feature(struct device *dev, unsigned int bit)

{

	const u8 *features = get_feature_bits(dev) + dev->feature_len;



	if (dev->feature_len < bit / CHAR_BIT)

		return false;

	return features[bit / CHAR_BIT] & (1 << (bit % CHAR_BIT));

}



static void start_device(struct device *dev)

{

	unsigned int i;
@@ -1079,8 +1064,6 @@ static void start_device(struct device *dev) 
		verbose(" %02x", get_feature_bits(dev)

			[dev->feature_len+i]);



	dev->irq_on_empty = accepted_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);



	for (vq = dev->vq; vq; vq = vq->next) {

		if (vq->service)

			create_thread(vq);
@@ -1564,7 +1547,6 @@ static void setup_tun_net(char *arg) 
	/* Set up the tun device. */

	configure_device(ipfd, tapif, ip);



	add_feature(dev, VIRTIO_F_NOTIFY_ON_EMPTY);

	/* Expect Guest to handle everything except UFO */

	add_feature(dev, VIRTIO_NET_F_CSUM);

	add_feature(dev, VIRTIO_NET_F_GUEST_CSUM);

arch/ia64/include/asm/unistd.h

+2 −1
Original line number Diff line number Diff line
@@ -320,11 +320,12 @@ 
#define __NR_clock_adjtime		1328

#define __NR_syncfs			1329

#define __NR_setns			1330

#define __NR_sendmmsg			1331



#ifdef __KERNEL__





#define NR_syscalls			307 /* length of syscall table */

#define NR_syscalls			308 /* length of syscall table */



/*

 * The following defines stop scripts/checksyscalls.sh from complaining about

arch/ia64/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -1776,6 +1776,7 @@ sys_call_table: 
	data8 sys_clock_adjtime

	data8 sys_syncfs

	data8 sys_setns				// 1330

	data8 sys_sendmmsg



	.org sys_call_table + 8*NR_syscalls	// guard against failures to increase NR_syscalls

#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */