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

Commit c63d352f authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 862b3d20 bc3913a5

Makefile

+9 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Psychotic Stoned Sheep



# *DOCUMENTATION*
@@ -607,6 +607,13 @@ else 
include/config/auto.conf: ;

endif # $(dot-config)



# For the kernel to actually contain only the needed exported symbols,

# we have to build modules as well to determine what those symbols are.

# (this can be evaluated only once include/config/auto.conf has been included)

ifdef CONFIG_TRIM_UNUSED_KSYMS

  KBUILD_MODULES := 1

endif



# The all: target is the default when no target is given on the

# command line.

# This allow a user to issue only 'make' to build a kernel including modules
@@ -944,7 +951,7 @@ ifdef CONFIG_GDB_SCRIPTS 
endif

ifdef CONFIG_TRIM_UNUSED_KSYMS

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/adjust_autoksyms.sh \

	  "$(MAKE) KBUILD_MODULES=1 -f $(srctree)/Makefile vmlinux_prereq"

	  "$(MAKE) -f $(srctree)/Makefile vmlinux"

endif



# standalone target for easier testing

arch/powerpc/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \ 
		ns16550.c serial.c simple_alloc.c div64.S util.S \

		elf_util.c $(zlib-y) devtree.c stdlib.c \

		oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \

		uartlite.c mpc52xx-psc.c opal.c opal-calls.S

		uartlite.c mpc52xx-psc.c opal.c

src-wlib-$(CONFIG_PPC64_BOOT_WRAPPER) +=  opal-calls.S

src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c

src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c

src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c fsl-soc.c

arch/powerpc/boot/opal.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <libfdt.h>

#include "../include/asm/opal-api.h"



#ifdef __powerpc64__

#ifdef CONFIG_PPC64_BOOT_WRAPPER



/* Global OPAL struct used by opal-call.S */

struct opal {

arch/powerpc/kernel/eeh_driver.c

+3 −1
Original line number Diff line number Diff line
@@ -671,8 +671,10 @@ static int eeh_reset_device(struct eeh_pe *pe, struct pci_bus *bus, 


	/* Clear frozen state */

	rc = eeh_clear_pe_frozen_state(pe, false);

	if (rc)

	if (rc) {

		pci_unlock_rescan_remove();

		return rc;

	}



	/* Give the system 5 seconds to finish running the user-space

	 * hotplug shutdown scripts, e.g. ifdown for ethernet.  Yes,

arch/powerpc/kernel/vmlinux.lds.S

+9 −0
Original line number Diff line number Diff line
@@ -94,8 +94,17 @@ SECTIONS 
	 * detected, and will result in a crash at boot due to offsets being

	 * wrong.

	 */

#ifdef CONFIG_PPC64

	/*

	 * BLOCK(0) overrides the default output section alignment because

	 * this needs to start right after .head.text in order for fixed

	 * section placement to work.

	 */

	.text BLOCK(0) : AT(ADDR(.text) - LOAD_OFFSET) {

#else

	.text : AT(ADDR(.text) - LOAD_OFFSET) {

		ALIGN_FUNCTION();

#endif

		/* careful! __ftr_alt_* sections need to be close to .text */

		*(.text .fixup __ftr_alt_* .ref.text)

		SCHED_TEXT