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

Commit f91b22c3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branches 'core-ipi-for-linus', 'core-locking-for-linus',... 

Merge branches 'core-ipi-for-linus', 'core-locking-for-linus', 'tracing-fixes-for-linus', 'x86-debug-for-linus', 'x86-doc-for-linus', 'x86-gpu-for-linus' and 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  generic-ipi: Optimize accesses by using DEFINE_PER_CPU_SHARED_ALIGNED for IPI data

* 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  plist: Fix grammar mistake, and c-style mistake

* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  kprobes: Add mcount to the kprobes blacklist

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86_64: Print modules like i386 does

* 'x86-doc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Put 'nopat' in kernel-parameters

* 'x86-gpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64: Allow fbdev primary video code

* 'x86-rlimit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Use helpers for rlimits
parents 847f9c60 e03bcb68 9ca94d7c 8b833c50 f266d7f5 016ddd9b 477346ff 2854e72b

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1738,6 +1738,9 @@ and is between 256 and 4096 characters. It is defined in the file 
	nomfgpt		[X86-32] Disable Multi-Function General Purpose

			Timer usage (for AMD Geode machines).



	nopat		[X86] Disable PAT (page attribute table extension of

			pagetables) support.



	norandmaps	Don't use address space randomization.  Equivalent to

			echo 0 > /proc/sys/kernel/randomize_va_space

arch/x86/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -135,9 +135,7 @@ drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/ 
# suspend and hibernation support

drivers-$(CONFIG_PM) += arch/x86/power/



ifeq ($(CONFIG_X86_32),y)

drivers-$(CONFIG_FB) += arch/x86/video/

endif



####

# boot loader support. Several targets are kept for legacy purposes

arch/x86/ia32/ia32_aout.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs) 
	 * size limits imposed on them by creating programs with large

	 * arrays in the data or bss.

	 */

	rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;

	rlim = rlimit(RLIMIT_DATA);

	if (rlim >= RLIM_INFINITY)

		rlim = ~0;

	if (ex.a_data + ex.a_bss > rlim)

arch/x86/include/asm/fb.h

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 
		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;

}



#ifdef CONFIG_X86_32

extern int fb_is_primary_device(struct fb_info *info);

#else

static inline int fb_is_primary_device(struct fb_info *info) { return 0; }

#endif



#endif /* _ASM_X86_FB_H */

arch/x86/kernel/dumpstack_64.c

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ void show_registers(struct pt_regs *regs) 


	sp = regs->sp;

	printk("CPU %d ", cpu);

	print_modules();

	__show_regs(regs, 1);

	printk("Process %s (pid: %d, threadinfo %p, task %p)\n",

		cur->comm, cur->pid, task_thread_info(cur), cur);