Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (058250a0) · Commits · e / devices / android_kernel_xiaomi_sm6125

Documentation/accounting/getdelays.c

+42 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@

		#include <linux/genetlink.h>
		#include <linux/taskstats.h>
		#include <linux/cgroupstats.h>

		/*
		* Generic macros for dealing with netlink sockets. Might be duplicated
		@@ -78,6 +79,7 @@ static void usage(void)
		fprintf(stderr, " -i: print IO accounting (works only with -p)\n");
		fprintf(stderr, " -l: listen forever\n");
		fprintf(stderr, " -v: debug on\n");
		fprintf(stderr, " -C: container path\n");
		}

		/*
		@@ -212,6 +214,14 @@ void task_context_switch_counts(struct taskstats *t)
		t->nvcsw, t->nivcsw);
		}

		void print_cgroupstats(struct cgroupstats *c)
		{
		printf("sleeping %llu, blocked %llu, running %llu, stopped %llu, "
		"uninterruptible %llu\n", c->nr_sleeping, c->nr_io_wait,
		c->nr_running, c->nr_stopped, c->nr_uninterruptible);
		}


		void print_ioacct(struct taskstats *t)
		{
		printf("%s: read=%llu, write=%llu, cancelled_write=%llu\n",
		@@ -239,11 +249,14 @@ int main(int argc, char *argv[])
		int maskset = 0;
		char *logfile = NULL;
		int loop = 0;
		int containerset = 0;
		char containerpath[1024];
		int cfd = 0;

		struct msgtemplate msg;

		while (1) {
		c = getopt(argc, argv, "qdiw:r:m:t:p:vl");
		c = getopt(argc, argv, "qdiw:r:m:t:p:vlC:");
		if (c < 0)
		break;

		@@ -260,6 +273,10 @@ int main(int argc, char *argv[])
		printf("printing task/process context switch rates\n");
		print_task_context_switch_counts = 1;
		break;
		case 'C':
		containerset = 1;
		strncpy(containerpath, optarg, strlen(optarg) + 1);
		break;
		case 'w':
		logfile = strdup(optarg);
		printf("write to file %s\n", logfile);
		@@ -334,6 +351,11 @@ int main(int argc, char *argv[])
		}
		}

		if (tid && containerset) {
		fprintf(stderr, "Select either -t or -C, not both\n");
		goto err;
		}

		if (tid) {
		rc = send_cmd(nl_sd, id, mypid, TASKSTATS_CMD_GET,
		cmd_type, &tid, sizeof(__u32));
		@@ -344,6 +366,20 @@ int main(int argc, char *argv[])
		}
		}

		if (containerset) {
		cfd = open(containerpath, O_RDONLY);
		if (cfd < 0) {
		perror("error opening container file");
		goto err;
		}
		rc = send_cmd(nl_sd, id, mypid, CGROUPSTATS_CMD_GET,
		CGROUPSTATS_CMD_ATTR_FD, &cfd, sizeof(__u32));
		if (rc < 0) {
		perror("error sending cgroupstats command");
		goto err;
		}
		}

		do {
		int i;

		@@ -422,6 +458,9 @@ int main(int argc, char *argv[])
		}
		break;

		case CGROUPSTATS_TYPE_CGROUP_STATS:
		print_cgroupstats(NLA_DATA(na));
		break;
		default:
		fprintf(stderr, "Unknown nla_type %d\n",
		na->nla_type);
		@@ -443,5 +482,7 @@ int main(int argc, char *argv[])
		close(nl_sd);
		if (fd)
		close(fd);
		if (cfd)
		close(cfd);
		return 0;
		}

Documentation/feature-removal-schedule.txt

+0 −9

Original line number	Diff line number	Diff line
		@@ -181,15 +181,6 @@ Who: Nick Piggin <npiggin@suse.de>

		---------------------------

		What: Interrupt only SA_* flags
		When: September 2007
		Why: The interrupt related SA_* flags are replaced by IRQF_* to move them
		out of the signal namespace.

		Who: Thomas Gleixner <tglx@linutronix.de>

		---------------------------

		What: PHYSDEVPATH, PHYSDEVBUS, PHYSDEVDRIVER in the uevent environment
		When: October 2008
		Why: The stacking of class devices makes these values misleading and

Documentation/markers.txt

+4 −2

Original line number	Diff line number	Diff line
		@@ -35,12 +35,14 @@ In order to use the macro trace_mark, you should include linux/marker.h.

		And,

		trace_mark(subsystem_event, "%d %s", someint, somestring);
		trace_mark(subsystem_event, "myint %d mystring %s", someint, somestring);
		Where :
		- subsystem_event is an identifier unique to your event
		- subsystem is the name of your subsystem.
		- event is the name of the event to mark.
		- "%d %s" is the formatted string for the serializer.
		- "myint %d mystring %s" is the formatted string for the serializer. "myint" and
		"mystring" are repectively the field names associated with the first and
		second parameter.
		- someint is an integer.
		- somestring is a char pointer.

Documentation/rtc.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -180,9 +180,10 @@ driver returns ENOIOCTLCMD. Some common examples:
		* RTC_IRQP_SET, RTC_IRQP_READ: the irq_set_freq function will be called
		to set the frequency while the framework will handle the read for you
		since the frequency is stored in the irq_freq member of the rtc_device
		structure. Also make sure you set the max_user_freq member in your
		initialization routines so the framework can sanity check the user
		input for you.
		structure. Your driver needs to initialize the irq_freq member during
		init. Make sure you check the requested frequency is in range of your
		hardware in the irq_set_freq function. If you cannot actually change
		the frequency, just return -ENOTTY.

		If all else fails, check out the rtc-test.c driver!

Makefile

+9 −9

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 24
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Arr Matey! A Hairy Bilge Rat!

		# DOCUMENTATION
		@@ -197,8 +197,13 @@ CROSS_COMPILE ?=
		UTS_MACHINE := $(ARCH)
		SRCARCH := $(ARCH)

		# for i386 and x86_64 we use SRCARCH equal to x86
		SRCARCH := $(if $(filter x86_64 i386,$(SRCARCH)),x86,$(SRCARCH))
		# Additional ARCH settings for x86
		ifeq ($(ARCH),i386)
		SRCARCH := x86
		endif
		ifeq ($(ARCH),x86_64)
		SRCARCH := x86
		endif

		KCONFIG_CONFIG ?= .config

		@@ -1327,12 +1332,7 @@ else
		ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
		endif

		# Take care of arch/x86
		ifeq ($(ARCH), $(SRCARCH))
		ALLSOURCE_ARCHS := $(ARCH)
		else
		ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
		endif
		ALLSOURCE_ARCHS := $(SRCARCH)

		define find-sources
		( for arch in $(ALLSOURCE_ARCHS) ; do \