Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (525352eb) · Commits · e / devices / android_kernel_xiaomi_nabu

Documentation/arm/00-INDEX

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,5 +16,7 @@ empeg
		- Empeg documentation
		mem_alignment
		- alignment abort handler documentation
		memory.txt
		- description of the virtual memory layout
		nwfpe
		- NWFPE floating point emulator documentation

+13 −13

Original line number	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
		you.

		user_xattr (*) Enables POSIX Extended Attributes. It's enabled by
		default, however you need to confifure its support
		(CONFIG_EXT3_FS_XATTR). This is neccesary if you want
		to use POSIX Acces Control Lists support. You can visit
		http://acl.bestbits.at to know more about POSIX Extended
		attributes.

		nouser_xattr Disables POSIX Extended Attributes.

		acl (*) Enables POSIX Access Control Lists support. This is
		enabled by default, however you need to configure
		its support (CONFIG_EXT3_FS_POSIX_ACL). If you want
		to know more about ACLs visit http://acl.bestbits.at
		user_xattr Enables Extended User Attributes. Additionally, you need
		to have extended attribute support enabled in the kernel
		configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)
		manual page and http://acl.bestbits.at to learn more
		about extended attributes.

		nouser_xattr Disables Extended User Attributes.

		acl Enables POSIX Access Control Lists support. Additionally,
		you need to have ACL support enabled in the kernel
		configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)
		manual page and http://acl.bestbits.at for more
		information.

		noacl This option disables POSIX Access Control List support.

+1 −1

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

		no-dot-config-targets := clean mrproper distclean \
		cscope TAGS tags help %docs check% kernelrelease
		cscope TAGS tags help %docs check%

		config-targets := 0
		mixed-targets := 0

+9 −0

Original line number	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;

		if ((insn & 0x0fffffd0) == 0x012fff10) {
		/*
		* bx or blx
		*/
		alt = get_user_reg(child, insn & 15);
		break;
		}


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

+1 −1

Original line number	Diff line number	Diff line
		@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
		*/
		save_previous_kprobe(kcb);
		set_current_kprobe(p, regs, kcb);
		p->nmissed++;
		kprobes_inc_nmissed_count(p);
		prepare_singlestep(p, regs);
		kcb->kprobe_status = KPROBE_REENTER;
		return 1;