Commit graph android_kernel_sony_sdm845/Makefile
Message SHA1
Fix collateral damage to top level Makefile
The patch named "powerpc/mpc5121: Add clock driver", also contained
an unrelated and bogus change to the top-level makefile.  This patch
backs out the bad bit.

SHA1 of offending patch: 137e95906e)

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Repented-by: John Rigby <jrigby@freescale.com>
[ Heh. Normally I pick these out from the diffstats, but I guess
  I've grown to trust the ppc tree too much ;)   - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Grant Likely   authored and   Linus Torvalds   commited 2008-07-17 09:05:12 -07:00
7023cc6129
Fix MIPS cross-compile problem
Crosscompiling on a Fedora 9 machine running gcc 4.3.0 as its host compiler
and gcc 3.4.6 for the mips-linux target results in the following build
error:

$ make malta_defconfig
$ make
cc1: error: unrecognized command line option "-fno-stack-protector"
scripts/kconfig/conf -s arch/mips/Kconfig
cc1: error: unrecognized command line option "-fno-stack-protector"

The arch Makefile is included too late so the host compiler is feature
tested, not the crosscompiler as intended and thus the Makefile applies
adds -fno-stack-protector to crosscompiler's flags which fails for gcc
3.4.6.  The bug was introduced by e06b8b98da
in 2.6.25; 35bb5b1e0e did add more flags
testing before the arch Makefile inclusion.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Ralf Baechle   authored and   Linus Torvalds   commited 2008-07-16 11:42:32 -07:00
bef5b54bd7
Merge commit 'origin/master'
Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

Benjamin Herrenschmidt   commited 2008-07-16 11:07:59 +10:00
84c3d4aaec
Merge commit '85082fd7cb' into test-build
Manual fixup of:

	arch/powerpc/Kconfig

Benjamin Herrenschmidt   commited 2008-07-15 15:44:51 +10:00
43d2548bb2
Merge commit 'gcl/gcl-next'
Benjamin Herrenschmidt   commited 2008-07-15 11:55:27 +10:00
5b0504c0d7
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
  firmware: convert sb16_csp driver to use firmware loader exclusively
  dsp56k: use request_firmware
  edgeport-ti: use request_firmware()
  edgeport: use request_firmware()
  vicam: use request_firmware()
  dabusb: use request_firmware()
  cpia2: use request_firmware()
  ip2: use request_firmware()
  firmware: convert Ambassador ATM driver to request_firmware()
  whiteheat: use request_firmware()
  ti_usb_3410_5052: use request_firmware()
  emi62: use request_firmware()
  emi26: use request_firmware()
  keyspan_pda: use request_firmware()
  keyspan: use request_firmware()
  ttusb-budget: use request_firmware()
  kaweth: use request_firmware()
  smctr: use request_firmware()
  firmware: convert ymfpci driver to use firmware loader exclusively
  firmware: convert maestro3 driver to use firmware loader exclusively
  ...

Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.

Linus Torvalds   commited 2008-07-14 16:54:07 -07:00
5a86102248
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:

	sound/pci/Kconfig

David Woodhouse   commited 2008-07-14 15:51:11 -07:00
751851af7a
Merge branch 'auto-ftrace-next' into tracing/for-linus
Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Ingo Molnar   commited 2008-07-14 16:11:52 +02:00
5806b81ac1
Linux 2.6.26
Linus Torvalds   commited 2008-07-13 14:51:29 -07:00
bce7f793da
powerpc/mpc5121: Add clock driver
Plugs into the generic powerpc clock driver in
arch/powerpc/kernel/clock.c

The following subset of clk_interface is implemented:
    clk_get, clk_put:  get clock via name, release clock
    clk_enable, clk_disable:  enable or disable clock
    clk_get_rate:  get clock rate in Hz
    clk_set_rate:  stubbed
    clk_round_rate:  stubbed
    clk_set_parent: NULL
    clk_get_parent: NULL

Signed-off-by: John Rigby <jrigby@freescale.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

John Rigby   authored and   Grant Likely   commited 2008-07-12 12:10:54 -06:00
137e95906e
firmware: Add firmware installation to modules_install, add firmware_install
For 'make modules_install', install any firmware required by
the modules which are being installed.

Also add a 'make firmware_install' target which doesn't depend on the
configuration, but installs _all_ available in-kernel-tree firmware into
$(INSTALL_FW_PATH), which defaults to /lib/firmware. This is intended
for distributors to make arch-independent (and config-independent)
packages containing firmware.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

David Woodhouse   commited 2008-07-10 14:47:34 +01:00
88ecf814c4
firmware: Add CONFIG_EXTRA_FIRMWARE option
This allows arbitrary firmware files to be included in the static kernel
where the firmware loader can find them without requiring userspace to
be alive.

(Updated and CONFIG_EXTRA_FIRMWARE_DIR added with lots of help from
Johannes Berg).

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

David Woodhouse   commited 2008-07-10 14:30:39 +01:00
4d2acfbfdf
Merge branch 'tracing/ftrace' into auto-ftrace-next
Ingo Molnar   commited 2008-07-10 11:43:00 +02:00
bac0c9103b
Linux 2.6.26-rc9
Linus Torvalds   commited 2008-07-05 15:53:22 -07:00
b7279469d6
Merge branch 'linus' into tracing/ftrace
Ingo Molnar   commited 2008-06-25 12:27:56 +02:00
97e6722b8d
Linux 2.6.26-rc8
Linus Torvalds   commited 2008-06-24 18:58:20 -07:00
543cf4cb3f
Merge branch 'linus' into tracing/ftrace
Ingo Molnar   commited 2008-06-23 11:11:42 +02:00
f34bfb1bee
Linux 2.6.26-rc7
Linus Torvalds   commited 2008-06-20 16:19:44 -07:00
d70ac829b7
Merge branch 'linus' into tracing/ftrace
Ingo Molnar   commited 2008-06-16 11:15:58 +02:00
e765ee90da
Linux 2.6.26-rc6
.. and a new name, courtesy of Alan.

Linus Torvalds   commited 2008-06-12 14:22:24 -07:00
5dd34572ad
Linux 2.6.26-rc5
Linus Torvalds   commited 2008-06-04 20:10:44 -07:00
53c8ba9540
Linux 2.6.26-rc4
Linus Torvalds   commited 2008-05-26 11:08:11 -07:00
e490517a03
ftrace: add basic support for gcc profiler instrumentation
If CONFIG_FTRACE is selected and /proc/sys/kernel/ftrace_enabled is
set to a non-zero value the ftrace routine will be called everytime
we enter a kernel function that is not marked with the "notrace"
attribute.

The ftrace routine will then call a registered function if a function
happens to be registered.

[ This code has been highly hacked by Steven Rostedt and Ingo Molnar,
  so don't blame Arnaldo for all of this ;-) ]

Update:
  It is now possible to register more than one ftrace function.
  If only one ftrace function is registered, that will be the
  function that ftrace calls directly. If more than one function
  is registered, then ftrace will call a function that will loop
  through the functions to call.

Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Arnaldo Carvalho de Melo   authored and   Thomas Gleixner   commited 2008-05-23 20:31:58 +02:00
16444a8a40
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  Don't clean bounds.h and asm-offsets.h
  kconfig: incorrect 'len' field initialisation ?
  kernel-doc: allow unnamed bit-fields
  kbuild: filter away debug symbols from kernel symbols
  Remove *.rej pattern from .gitignore
  MAINTAINERS: document names of new kbuild trees
  kbuild: disable modpost warnings for linkonce sections
  kbuild: escape meta characters in regular expression in make TAGS

Linus Torvalds   commited 2008-05-19 11:32:21 -07:00
1bf9947722
Don't clean bounds.h and asm-offsets.h
Since 97965478a6 ("mm: Get rid of __ZONE_COUNT")
mmzone.h includes bounds.h.
Calling make clean after make prepare removes bounds.h
again so when building external modules this fails.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
--

Jan Blunck   authored and   Sam Ravnborg   commited 2008-05-19 20:18:24 +02:00
7d3cc8b6d8
Linux 2.6.26-rc3
Linus Torvalds   commited 2008-05-18 14:36:41 -07:00
b8291ad07a
Linux 2.6.26-rc2
Linus Torvalds   commited 2008-05-11 17:09:41 -07:00
492c2e476e
kbuild: escape meta characters in regular expression in make TAGS
Alexey Dobriyan <adobriyan@gmail.com> introduced a code adds
menuconfig SOMETHING in Kconfig to tags output when you did "make tags".

See http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80ff26241623875636674a31c0540a78c0fb5433

"make tags" may work fine with his code. However make TAGS doesn't work well
because etags command requires backslashes to escape meta characters like
`(', `)' and `|'.

Here is a patch.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Masatake YAMATO   authored and   Sam Ravnborg   commited 2008-05-11 10:10:48 +02:00
a95bcfac2b
Linux 2.6.26-rc1
Linus Torvalds   commited 2008-05-03 11:59:44 -07:00
2ddcca36c8
kbuild: fix vmlinux.o link
We always linked vmliux.o.
Remove init/built-in.o dependency so we avoid this

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Sam Ravnborg   commited 2008-05-01 19:31:35 +02:00
90ebd878a5
kbuild: fix help output to show correct arch
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Andres Salomon   authored and   Sam Ravnborg   commited 2008-04-28 22:46:11 +02:00
01dee1881d
kbuild: show defconfig subdirs in make help
PowerPC will start moving board defconfigs into subarch-specific
subdirs soon.  "make help" currently does not look in subdirs to
find the defconfigs to show.  This is partially a good thing,
since there are way too many defconfigs for one list.

This patch makes the main "make help" display something like

  help-40x         - Show 40x-specific targets
  help-44x         - Show 44x-specific targets
  help-boards      - Show all of the above

and wires up stuff so those new help-* commands actually work.

[sam: fixed it up to display x86 defconfigs too]
Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Segher Boessenkool   authored and   Sam Ravnborg   commited 2008-04-28 22:40:14 +02:00
5dffbe811b
kbuild: fix depmod comment
Signed-off-by: Uwe Kleine-KĂśnig <Uwe.Kleine-Koenig@digi.com>
Cc: trivial@kernel.org
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Uwe Kleine-KĂśnig   authored and   Sam Ravnborg   commited 2008-04-25 20:49:40 +02:00
0254da07d9
Add option to enable -Wframe-larger-than= on gcc 4.4
Add option to enable -Wframe-larger-than= on gcc 4.4

gcc mainline (upcoming 4.4) added a new -Wframe-larger-than=...
option to warn at build time about too large stack frames. Add a config
option to enable this warning, since this very useful for the kernel.

I choose (somewhat arbitarily) 2048 as default warning threshold for 64bit
and 1024 as default for 32bit architectures.  With some research and
fixing all the code for smaller values these defaults should be probably
lowered.

With the default allyesconfigs have some new warnings, but I think
that is all code that should be just fixed.

At some point (when gcc 4.4 is released and widely used) this should
obsolete make checkstack

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Andi Kleen   authored and   Sam Ravnborg   commited 2008-04-25 20:23:47 +02:00
35bb5b1e0e
kbuild: add kconfig symbols to tags output
Steps to reproduce:

	vi -t NETFILTER

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

Alexey Dobriyan   authored and   Sam Ravnborg   commited 2008-04-25 20:20:42 +02:00
80ff262416
Remove -numa from EXTRAVERSION
This snuck in through 919ee677b6
("[SPARC64]: Add NUMA support")

Signed-off-by: Sebastian Siewior <sebastian@breakpoint.cc>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Sebastian Siewior   authored and   Linus Torvalds   commited 2008-04-24 12:38:04 -07:00
f764e51421
[SPARC64]: Add NUMA support.
Currently there is only code to parse NUMA attributes on
sun4v/niagara systems, but later on we will add such parsing
for older systems.

Signed-off-by: David S. Miller <davem@davemloft.net>

David S. Miller   commited 2008-04-23 23:32:17 -07:00
919ee677b6
fix typo "is" -> "if" in Makefile
It should be "if" but is written as "is"..

Signed-off-by: Uwe Kleine-Koenig <Uwe.Kleine-Koenig@digi.com>
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>

Uwe Kleine-König   authored and   Jesper Juhl   commited 2008-04-21 22:53:56 +00:00
bc3c26fe65
Linux 2.6.25
Linus Torvalds   commited 2008-04-16 19:49:44 -07:00
4b119e21d0
Linux 2.6.25-rc9
Linus Torvalds   commited 2008-04-11 13:32:29 -07:00
120dd64cac
Linux 2.6.25-rc8
Linus Torvalds   commited 2008-04-01 12:44:26 -07:00
0e81a8ae37
Linux 2.6.25-rc7
Linus Torvalds   commited 2008-03-25 18:38:14 -07:00
05dda977f2
kbuild: soften modpost checks when doing cross builds
The module alias support in the kernel have a consistency
check where it is checked that the size of a structure
in the kernel and on the build host are the same.
For cross builds this check does not make sense so detect
when we do cross builds and silently skip the check in these
situations.
This fixes a build bug for a wireless driver when cross building
for arm.

Acked-by: Michael Buesch <mb@bu3sch.de>
Tested-by: Gordon Farquharson <gordonfarquharson@gmail.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: stable@kernel.org

Sam Ravnborg   commited 2008-03-23 21:38:54 +01:00
4ce6efed48
Linux 2.6.25-rc6
Linus Torvalds   commited 2008-03-16 16:32:14 -07:00
a978b30af3
Linux 2.6.25-rc5
Linus Torvalds   commited 2008-03-09 22:22:27 -07:00
cdeeeae056
Linux 2.6.25-rc4
Linus Torvalds   commited 2008-03-04 20:33:54 -08:00
29e8c3c304
Linux 2.6.25-rc3
Linus Torvalds   commited 2008-02-24 13:25:54 -08:00
bfa274e243
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  kbuild: explain why DEBUG_SECTION_MISMATCH is UNDEFINED
  kbuild: fix building vmlinux.o
  kbuild: allow -fstack-protector to take effect
  kconfig: fix select in combination with default

Linus Torvalds   commited 2008-02-18 15:41:05 -08:00
230b548c15
Linux 2.6.25-rc2
Linus Torvalds   commited 2008-02-15 12:57:20 -08:00
101142c37b
kbuild: fix building vmlinux.o
Ingo Molnar wrote:
>
> i've got a build log from a weird build error below:
>
>   LD      init/built-in.o
> distcc[12023] ERROR: compile (null) on localhost failed
> make: *** [vmlinux.o] Error 1
> make: *** Waiting for unfinished jobs....
>   LD      .tmp_vmlinux1
>

Building vmlinux.o were moved up in the dependency chain so we started
to build it before the kallsym stuff. This was done to let modpost
report section mismatch bugs even when the final link failed.

Originally I had expected the dependency of $(kallsyms.o) to
cover this but it turns out that we need to be even more explicit.
Fix this by adding a conditional dependency on firat target
used in the kallsyms serie of builds.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>

Sam Ravnborg   commited 2008-02-14 23:33:25 +01:00
cf87dcd140