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

Commit 97e6722b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into tracing/ftrace

parents f22f9a89 543cf4cb

Documentation/DocBook/kgdb.tmpl

+6 −14
Original line number Diff line number Diff line
@@ -84,10 +84,9 @@ 
    runs an instance of gdb against the vmlinux file which contains

    the symbols (not boot image such as bzImage, zImage, uImage...).

    In gdb the developer specifies the connection parameters and

    connects to kgdb.  Depending on which kgdb I/O modules exist in

    the kernel for a given architecture, it may be possible to debug

    the test machine's kernel with the development machine using a

    rs232 or ethernet connection.

    connects to kgdb.  The type of connection a developer makes with

    gdb depends on the availability of kgdb I/O modules compiled as

    builtin's or kernel modules in the test machine's kernel.

    </para>

  </chapter>

  <chapter id="CompilingAKernel">
@@ -223,7 +222,7 @@ 
  </para>

  <para>

  IMPORTANT NOTE: Using this option with kgdb over the console

  (kgdboc) or kgdb over ethernet (kgdboe) is not supported.

  (kgdboc) is not supported.

  </para>

  </sect1>

  </chapter>
@@ -249,18 +248,11 @@ 
    (gdb) target remote /dev/ttyS0

    </programlisting>

    <para>

    Example (kgdb to a terminal server):

    Example (kgdb to a terminal server on tcp port 2012):

    </para>

    <programlisting>

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    </programlisting>

    <para>

    Example (kgdb over ethernet):

    </para>

    <programlisting>

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    (gdb) target remote 192.168.2.2:2012

    </programlisting>

    <para>

    Once connected, you can debug a kernel the way you would debug an

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 26

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Rotary Wombat



# *DOCUMENTATION*

arch/ia64/kernel/iosapic.c

+0 −2
Original line number Diff line number Diff line
@@ -558,8 +558,6 @@ static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void) 
	if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {

		rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *

				    NR_PREALLOCATE_RTE_ENTRIES);

		if (!rte)

			return NULL;

		for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)

			list_add(&rte->rte_list, &free_rte_list);

	}

arch/ia64/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -578,8 +578,6 @@ setup_arch (char **cmdline_p) 
	cpu_init();	/* initialize the bootstrap CPU */

	mmu_context_init();	/* initialize context_id bitmap */



	check_sal_cache_flush();



#ifdef CONFIG_ACPI

	acpi_boot_init();

#endif
@@ -607,6 +605,7 @@ setup_arch (char **cmdline_p) 
		ia64_mca_init();



	platform_setup(cmdline_p);

	check_sal_cache_flush();

	paging_init();

}

arch/ia64/sn/kernel/sn2/sn2_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static ssize_t sn2_ptc_proc_write(struct file *file, const char __user *user, si 
	int cpu;

	char optstr[64];



	if (count > sizeof(optstr))

	if (count == 0 || count > sizeof(optstr))

		return -EINVAL;

	if (copy_from_user(optstr, user, count))

		return -EFAULT;