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

Commit 9da305eb authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents d96212ed 14ee0a14

Documentation/arm/00-INDEX

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,5 +16,7 @@ empeg 
	- Empeg documentation

	- Empeg documentation

mem_alignment

mem_alignment

	- alignment abort handler documentation

	- alignment abort handler documentation

memory.txt

	- description of the virtual memory layout

nwfpe

nwfpe

	- NWFPE floating point emulator documentation
 
	- NWFPE floating point emulator documentation

Documentation/filesystems/ext3.txt

+13 −13
Original line number Original line Diff line number Diff line
@@ -57,19 +57,19 @@ oldalloc This disables the Orlov block allocator and enables the 
			we'd like to get some feedback if it's the contrary for

			we'd like to get some feedback if it's the contrary for

			you.

			you.





user_xattr	(*)	Enables POSIX Extended Attributes. It's enabled by

user_xattr		Enables Extended User Attributes. Additionally, you need

			default, however you need to confifure its support

			to have extended attribute support enabled in the kernel

			(CONFIG_EXT3_FS_XATTR). This is neccesary if you want

			configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)

			to use POSIX Acces Control Lists support. You can visit

			manual page and http://acl.bestbits.at to learn more

			http://acl.bestbits.at to know more about POSIX Extended

			about extended attributes.

			attributes.





nouser_xattr		Disables Extended User Attributes.

nouser_xattr		Disables POSIX Extended Attributes.





acl			Enables POSIX Access Control Lists support.  Additionally,

acl		(*)	Enables POSIX Access Control Lists support. This is

			you need to have ACL support enabled in the kernel

			enabled by default, however you need to configure

			configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)

			its support (CONFIG_EXT3_FS_POSIX_ACL). If you want

			manual page and http://acl.bestbits.at for more

			to know more about ACLs visit http://acl.bestbits.at

			information.





noacl			This option disables POSIX Access Control List support.

noacl			This option disables POSIX Access Control List support.

Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -408,7 +408,7 @@ outputmakefile: 
# of make so .config is not included in this case either (for *config).

# of make so .config is not included in this case either (for *config).





no-dot-config-targets := clean mrproper distclean \

no-dot-config-targets := clean mrproper distclean \

			 cscope TAGS tags help %docs check% kernelrelease

			 cscope TAGS tags help %docs check%





config-targets := 0

config-targets := 0

mixed-targets  := 0

mixed-targets  := 0

arch/arm/kernel/ptrace.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in 
		 */

		 */

		long aluop1, aluop2, ccbit;

		long aluop1, aluop2, ccbit;





	        if ((insn & 0x0fffffd0) == 0x012fff10) {

		        /*

			 * bx or blx

			 */

			alt = get_user_reg(child, insn & 15);

			break;

		}





		if ((insn & 0xf000) != 0xf000)

		if ((insn & 0xf000) != 0xf000)

			break;

			break;

arch/i386/kernel/kprobes.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
			 */

			 */

			save_previous_kprobe(kcb);

			save_previous_kprobe(kcb);

			set_current_kprobe(p, regs, kcb);

			set_current_kprobe(p, regs, kcb);

			p->nmissed++;

			kprobes_inc_nmissed_count(p);

			prepare_singlestep(p, regs);

			prepare_singlestep(p, regs);

			kcb->kprobe_status = KPROBE_REENTER;

			kcb->kprobe_status = KPROBE_REENTER;

			return 1;

			return 1;