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

Commit 4dd163a0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core

parents 6cc3c6e1 7cf49427 99adcd9d

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -335,3 +335,12 @@ Why: In 2.6.18 the Secmark concept was introduced to replace the "compat_net" 
	Secmark, it is time to deprecate the older mechanism and start the

	process of removing the old code.

Who:	Paul Moore <paul.moore@hp.com>

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



What:	sysfs ui for changing p4-clockmod parameters

When:	September 2009

Why:	See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and

	e088e4c9cdb618675874becb91b2fd581ee707e6.

	Removal is subject to fixing any remaining bugs in ACPI which may

	cause the thermal throttling not to happen at the right time.

Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>

Documentation/networking/ipv6.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 


Options for the ipv6 module are supplied as parameters at load time.



Module options may be given as command line arguments to the insmod

or modprobe command, but are usually specified in either the

/etc/modules.conf or /etc/modprobe.conf configuration file, or in a

distro-specific configuration file.



The available ipv6 module parameters are listed below.  If a parameter

is not specified the default value is used.



The parameters are as follows:



disable



	Specifies whether to load the IPv6 module, but disable all

	its functionality.  This might be used when another module

	has a dependency on the IPv6 module being loaded, but no

	IPv6 addresses or operations are desired.



	The possible values and their effects are:



	0

		IPv6 is enabled.



		This is the default value.



	1

		IPv6 is disabled.



		No IPv6 addresses will be added to interfaces, and

		it will not be possible to open an IPv6 socket.



		A reboot is required to enable IPv6.

arch/arm/mach-omap2/board-ldp.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static inline void __init ldp_init_smc911x(void) 
	}



	ldp_smc911x_resources[0].start = cs_mem_base + 0x0;

	ldp_smc911x_resources[0].end   = cs_mem_base + 0xf;

	ldp_smc911x_resources[0].end   = cs_mem_base + 0xff;

	udelay(100);



	eth_gpio = LDP_SMC911X_GPIO;

arch/x86/kernel/alternative.c

+2 −2
Original line number Diff line number Diff line
@@ -526,13 +526,12 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) 
		pages[1] = virt_to_page(addr + PAGE_SIZE);

	}

	BUG_ON(!pages[0]);

	local_irq_save(flags);

	set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));

	if (pages[1])

		set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));

	vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);

	local_irq_save(flags);

	memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);

	local_irq_restore(flags);

	clear_fixmap(FIX_TEXT_POKE0);

	if (pages[1])

		clear_fixmap(FIX_TEXT_POKE1);
@@ -542,5 +541,6 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) 
	   that causes hangs on some VIA CPUs. */

	for (i = 0; i < len; i++)

		BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);

	local_irq_restore(flags);

	return addr;

}

arch/x86/kernel/cpu/cpufreq/p4-clockmod.c

+0 −1
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ static struct cpufreq_driver p4clockmod_driver = { 
	.name		= "p4-clockmod",

	.owner		= THIS_MODULE,

	.attr		= p4clockmod_attr,

	.hide_interface	= 1,

};