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

Commit 445722f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] kprobe clears qp bits for special instructions
  [IA64] enable trap code on slot 1
  [IA64] Take defensive stance on ia64_pal_get_brand_info()
  [IA64] fix possible XPC deadlock when disconnecting
  [IA64] - Reduce overhead of FP exception logging messages
  [IA64] fix arch/ia64/mm/contig.c:235: warning: unused variable `nid'
  [IA64] s/termios/ktermios/ in simserial.c
  [IA64] kexec/kdump: tidy up declaration of relocate_new_kernel_t
  [IA64] Kexec/Kdump: honour non-zero crashkernel offset.
  [IA64] CONFIG_KEXEC/CONFIG_CRASH_DUMP permutations
  [IA64] Do not call SN_SAL_SET_CPU_NUMBER twice on cpu 0
parents 3641b536 df3e0d1c

arch/ia64/hp/sim/simserial.c

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file, 


#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))



static void rs_set_termios(struct tty_struct *tty, struct termios *old_termios)

static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)

{

	unsigned int cflag = tty->termios->c_cflag;

arch/ia64/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ 
obj-$(CONFIG_IA64_MCA_RECOVERY)	+= mca_recovery.o

obj-$(CONFIG_KPROBES)		+= kprobes.o jprobes.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_IA64_UNCACHED_ALLOCATOR)	+= uncached.o

obj-$(CONFIG_AUDIT)		+= audit.o

obj-$(CONFIG_PCI_MSI)		+= msi_ia64.o

arch/ia64/kernel/crash.c

+0 −22
Original line number Diff line number Diff line
@@ -19,29 +19,11 @@ 


#include <asm/kdebug.h>

#include <asm/mca.h>

#include <asm/uaccess.h>



int kdump_status[NR_CPUS];

atomic_t kdump_cpu_freezed;

atomic_t kdump_in_progress;

int kdump_on_init = 1;

ssize_t

copy_oldmem_page(unsigned long pfn, char *buf,

		size_t csize, unsigned long offset, int userbuf)

{

	void  *vaddr;



	if (!csize)

		return 0;

	vaddr = __va(pfn<<PAGE_SHIFT);

	if (userbuf) {

		if (copy_to_user(buf, (vaddr + offset), csize)) {

			return -EFAULT;

		}

	} else

		memcpy(buf, (vaddr + offset), csize);

	return csize;

}



static inline Elf64_Word

*append_elf_note(Elf64_Word *buf, char *name, unsigned type, void *data,
@@ -225,14 +207,10 @@ static ctl_table sys_table[] = { 
static int

machine_crash_setup(void)

{

	char *from = strstr(saved_command_line, "elfcorehdr=");

	static struct notifier_block kdump_init_notifier_nb = {

		.notifier_call = kdump_init_notifier,

	};

	int ret;

	if (from)

		elfcorehdr_addr = memparse(from+11, &from);

	saved_max_pfn = (unsigned long)-1;

	if((ret = register_die_notifier(&kdump_init_notifier_nb)) != 0)

		return ret;

#ifdef CONFIG_SYSCTL

arch/ia64/kernel/crash_dump.c

0 → 100644
+48 −0
Original line number Diff line number Diff line 
/*

 *	kernel/crash_dump.c - Memory preserving reboot related code.

 *

 *	Created by: Simon Horman <horms@verge.net.au>

 *	Original code moved from kernel/crash.c

 *	Original code comment copied from the i386 version of this file

 */



#include <linux/errno.h>

#include <linux/types.h>



#include <linux/uaccess.h>



/**

 * copy_oldmem_page - copy one page from "oldmem"

 * @pfn: page frame number to be copied

 * @buf: target memory address for the copy; this can be in kernel address

 *	space or user address space (see @userbuf)

 * @csize: number of bytes to copy

 * @offset: offset in bytes into the page (based on pfn) to begin the copy

 * @userbuf: if set, @buf is in user address space, use copy_to_user(),

 *	otherwise @buf is in kernel address space, use memcpy().

 *

 * Copy a page from "oldmem". For this page, there is no pte mapped

 * in the current kernel. We stitch up a pte, similar to kmap_atomic.

 *

 * Calling copy_to_user() in atomic context is not desirable. Hence first

 * copying the data to a pre-allocated kernel page and then copying to user

 * space in non-atomic context.

 */

ssize_t

copy_oldmem_page(unsigned long pfn, char *buf,

		size_t csize, unsigned long offset, int userbuf)

{

	void  *vaddr;



	if (!csize)

		return 0;

	vaddr = __va(pfn<<PAGE_SHIFT);

	if (userbuf) {

		if (copy_to_user(buf, (vaddr + offset), csize)) {

			return -EFAULT;

		}

	} else

		memcpy(buf, (vaddr + offset), csize);

	return csize;

}

arch/ia64/kernel/jprobes.S

+2 −1
Original line number Diff line number Diff line
@@ -45,13 +45,14 @@ 
 * to the correct location.

 */

#include <asm/asmmacro.h>

#include <asm-ia64/break.h>



	/*

	 * void jprobe_break(void)

	 */

	.section .kprobes.text, "ax"

ENTRY(jprobe_break)

	break.m 0x80300

	break.m __IA64_BREAK_JPROBE

END(jprobe_break)



	/*