Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (959327c7) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/kernel-parameters.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -315,8 +315,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		CPU-intensive style benchmark, and it can vary highly in
		a microbenchmark depending on workload and compiler.

		1: only for 32-bit processes
		2: only for 64-bit processes
		32: only for 32-bit processes
		64: only for 64-bit processes
		on: enable for both 32- and 64-bit processes
		off: disable for both 32- and 64-bit processes

+5 −5

Original line number	Diff line number	Diff line
		@@ -295,11 +295,11 @@ tcp_max_ssthresh - INTEGER
		Default: 0 (off)

		tcp_max_syn_backlog - INTEGER
		Maximal number of remembered connection requests, which are
		still did not receive an acknowledgment from connecting client.
		Default value is 1024 for systems with more than 128Mb of memory,
		and 128 for low memory machines. If server suffers of overload,
		try to increase this number.
		Maximal number of remembered connection requests, which have not
		received an acknowledgment from connecting client.
		The minimal value is 128 for low memory machines, and it will
		increase in proportion to the memory of machine.
		If server suffers from overload, try increasing this number.

		tcp_max_tw_buckets - INTEGER
		Maximal number of timewait sockets held by system simultaneously.

+2 −2

Original line number	Diff line number	Diff line
		@@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys
		[SourceDisksFiles]
		[SourceDisksNames]
		[DeviceList]
		%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02
		%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00

		[DeviceList.NTamd64]
		%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02
		%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00


		;------------------------------------------------------------------------------

+3 −3

Original line number	Diff line number	Diff line
		@@ -353,15 +353,15 @@ validate_group(struct perf_event *event)
		fake_pmu.used_mask = fake_used_mask;

		if (!validate_event(&fake_pmu, leader))
		return -ENOSPC;
		return -EINVAL;

		list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
		if (!validate_event(&fake_pmu, sibling))
		return -ENOSPC;
		return -EINVAL;
		}

		if (!validate_event(&fake_pmu, event))
		return -ENOSPC;
		return -EINVAL;

		return 0;
		}

+4 −4

Original line number	Diff line number	Diff line
		@@ -623,7 +623,7 @@ static int mipspmu_event_init(struct perf_event *event)
		if (!atomic_inc_not_zero(&active_events)) {
		if (atomic_read(&active_events) > MIPS_MAX_HWEVENTS) {
		atomic_dec(&active_events);
		return -ENOSPC;
		return -EINVAL;
		}

		mutex_lock(&pmu_reserve_mutex);
		@@ -732,15 +732,15 @@ static int validate_group(struct perf_event *event)
		memset(&fake_cpuc, 0, sizeof(fake_cpuc));

		if (!validate_event(&fake_cpuc, leader))
		return -ENOSPC;
		return -EINVAL;

		list_for_each_entry(sibling, &leader->sibling_list, group_entry) {
		if (!validate_event(&fake_cpuc, sibling))
		return -ENOSPC;
		return -EINVAL;
		}

		if (!validate_event(&fake_cpuc, event))
		return -ENOSPC;
		return -EINVAL;

		return 0;
		}