12 Dec, 2009
40 commits
-
On compilers with security warnings enabled by default, we get:
usr/gen_init_cpio.c: In function ‘cpio_mkfile’:
usr/gen_init_cpio.c:357: warning: ignoring return value of ‘fwrite’,
declared with attribute warn_unused_resultSo check the return value and handle errors accordingly.
Signed-off-by: Mike Frysinger
Signed-off-by: Michal Marek -
Fix typo / thinko in commit bc081dd.
Signed-off-by: Michal Marek
-
To make it easier for module-init-tools and scripts like mkinitrd to
distinguish builtin and missing modules, install a modules.builtin file
listing all builtin modules. This is done by generating an additional
config file (tristate.conf) with tristate options set to uppercase 'Y'
or 'M'. If we source that config file, the builtin modules appear in
obj-Y.Signed-off-by: Michal Marek
-
Despite being unused these should also get a CRC calculated.
Primarily I view this as a consistency thing. But I also think this is
one of the reasons why __crc_* need to be weak (which I think should be
avoided, and hence we should have the goal to eliminate this so that
failure to calculate a proper CRC for a symbol causes the build to fail).Signed-off-by: Jan Beulich
Cc: Anibal Monsalve Salazar
Cc: Steven Rostedt
Cc: Sam Ravnborg
Signed-off-by: Andrew Morton
Signed-off-by: Michal Marek -
A recent kbuild patch moved asm-offsets.h to include/generated. Provide
a wrapper header as for other architectures.Signed-off-by: Michal Marek
-
Fix handling of input files (e.g. with no newline at EOF) that could
make unifdef get into an unexpected state and call abort().The new -B option compresses blank lines around a deleted section
so that blank lines around "paragraphs" of code don't get doubled.The evaluator can now handle macros with arguments, and unbracketed
arguments to the "defined" operator.Add myself to MAINTAINERS for unifdef.
Signed-off-by: Tony Finch
Acked-by: Sam Ravnborg
Signed-off-by: Michal Marek -
Cscope doesn't hadle relative paths when cscope.out is not in $PWD. Use
absolute paths when generating cscope.files, which seems to be the
recommended way to generate cscope.out, anyway (at least according to
cscope.sf.net). The speed and size differences are minimal, the only
drawback is that the database needs to be regenerated if the source
directory is moved.[mmarek: fixed for O= builds, modified changelog]
Signed-off-by: Daniel Vetter
Signed-off-by: Michal Marek -
The toplevel Makefile creates the directory if it runs silentoldconfig
automatically, but if run manually, it fails:$ make mrproper
$ make defconfig && make silentoldconfig
*** Default configuration is based on 'x86_64_defconfig'
#
# configuration written to .config
#
scripts/kconfig/conf -s arch/x86/Kconfig*** Error during update of the kernel configuration.
...Move the mkdir command to the silentoldconfig target to make it work.
Signed-off-by: Michal Marek
-
Running "make deb-pkg" requires setting KBUILD_PKG_ROOTCMD or
becoming root oneself or it errors out. Unless already running
as root or KBUILD_PKG_ROOTCMD is already set, use fakeroot as a
good default.With this patch applied, you can run "make oldconfig deb-pkg" as
an ordinary user to build a binary package for an updated kernel
tree and it should just work.fakeroot is too zealous by default in treating files as owned by
root. Its wrapped stat() sets st_uid and st_gid to 0 for all
files, which causes Git to go on a wild goose chase if
CONFIG_LOCALVERSION_AUTO is set, checking if any file's content
has changed along with its stat information. Avoid this by
telling fakeroot to use the actual owner and group for
preexisting files, by passing it the -u option.Signed-off-by: Jonathan Nieder
Signed-off-by: Michal Marek -
Let the deb-pkg target acquire (fake) root privileges before
running commands that need them. Without such privileges,
deb-pkg errors out because chown fails.The new KBUILD_PKG_ROOTCMD variable, if defined, is used as a
command to run other commands with possibly fake elevated
privileges. Since this is not needed for the tar-pkg and rpm-pkg
targets, it is only used by deb-pkg. If it is not defined, the
behavior is as before, and the user will have to rerun make as
root.In other words, as a shortcut, instead of running 'make oldconfig &&
make && fakeroot -u make deb-pkg', one can use the single command
'make oldconfig deb-pkg KBUILD_PKG_ROOTCMD="fakeroot -u"'.Suggested-by: Ryan Anderson
Signed-off-by: Jonathan Nieder
Signed-off-by: Michal Marek -
Use the --owner= and --group= options to make sure the entries in
the built tar file are owned by root. Without this change, a
careless sysadmin using the tar-pkg target can easily end up
installing a kernel that is writable by the unprivileged user
account used to build the kernel.Test that these options are understood before using them so that
non-GNU versions of tar can still be used if the operator is
appropriately cautious.Signed-off-by: Jonathan Nieder
Signed-off-by: Michal Marek -
Drop Module.markers from cleaning list since marker
is removed.Signed-off-by: Wenji Huang
Signed-off-by: Michal Marek -
include/linux/net_tstamp.h is userspace API for hardware time stamping
of network packets. It should be exported to userspace.Signed-off-by: Jie Zhang
Signed-off-by: Barry Song
Signed-off-by: Patrick Ohly
Signed-off-by: Michal Marek -
Fix up all users of utsrelease.h
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
kbuild.h forces include of autoconf.h on the
commandline using -include - so we do not need to
include the file explicit.Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
We no longer use this directory for generated files and
all architectures has moved their header files so no
symlink tricks are needed either.Drop the symlink and drop the ARCH check.
If we really need to check that the SRCARCH has not changed
when we build a kernel we can add this check back - but then we will
find a more convenient way to store the info.Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
No architectures uses include/asm-$ARCH now.
So drop check for location of include filesSigned-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
There is no longer any use of the include2/ directory.
The generated files has moved to include/generated.Drop all references to said directory.
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
Signed-off-by: Sam Ravnborg
Cc: Paul Mundt
Cc: Al Viro
Signed-off-by: Michal Marek -
Simplified arch/arm/Makefile by dropping the maketools target
It was undocumented and not neededSigned-off-by: Sam Ravnborg
Cc: Al Viro
Cc: Russell King
Signed-off-by: Michal Marek -
Avoid generating files in the now deprecated asm-ia64 dir
Simplified the logic in the Makefile when editing stuff in the areaSigned-off-by: Sam Ravnborg
Cc: Al Viro
Cc: Tony Luck
Cc: Fenghua Yu
Signed-off-by: Michal Marek -
The simplest method was to add an extra asm-offsets.h
file in arch/$ARCH/include/asm that references the generated file.We can now migrate the architectures one-by-one to reference
the generated file direct - and when done we can delete the
temporary arch/$ARCH/include/asm/asm-offsets.h file.Signed-off-by: Sam Ravnborg
Cc: Al Viro
Signed-off-by: Michal Marek -
Signed-off-by: Sam Ravnborg
Cc: Al Viro
Signed-off-by: Michal Marek -
We move more and more stuff to include/generated - so lets ignore the
content for users of plain diff.Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
The namespace used in arch/$ARCH/include is different from
what is used in include/ except for the include/asm directory.This patch gives the arch/$ARCH/include/asm directory priority
over include/asm.When we add asm-offsets.h to arch/$ARCH/include/asm/ this
patch makes sure we pick up the arch specific version
and not the one we have in include/asm.The situation with an asm-offsets.h file located in
both include/asm _and_ arch/$ARCH/include/asm will happen
when we move more files over to include/generated.This happens because in some cases it is not practical
to rename all users so we simply add a file
in arch/$ARCH/include/asm that includes the generated version.This is the solution we use for asm-offsets.h as an example.
Signed-off-by: Sam Ravnborg
Cc: Stephen Rothwell
Signed-off-by: Michal Marek -
As has been discussed previously (and Sam has been CC'ed), the fix
is still incorrect. It replaces "echo -ne" with "/bin/echo -ne",
but neither of the two are guaranteed to support the necessary
arguments and necessary (hexadecimal) escape sequences. What should
be used here is printf(1). The trivial patch below (on top of these
kbuild changes) fixes this issue.Signed-Off-By: Michael Tokarev
Signed-off-by: Sam Ravnborg
Signed-off-by: Michal Marek -
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (75 commits)
net: Handle NETREG_UNINITIALIZED devices correctly
can: add the driver for Analog Devices Blackfin on-chip CAN controllers
xfrm: Fix truncation length of authentication algorithms installed via PF_KEY
net: use compat helper functions in compat_sys_recvmmsg
net: fix compat_sys_recvmmsg parameter type
cxgb3: Fixing EEH handlers
cnic: Zero out status block and Event Queue indices.
cnic: Send delete command when shutting down iSCSI ring.
net: smc91x: Fix up type mismatch in smc_drv_resume().
smc91x: fix unused flags warnings on UP systems
MAINTAINERS: Transfering maintainership of cdc-ether
net: Add missing TST_CFG_WRITE bits around sky2_pci_write
net: Fix Yukon-2 Optima TCP offload setup
net: niu uses crc32, so select CRC32
wireless: update old static regulatory domain rules
mac80211: Revert 'Use correct sign for mesh active path refresh'
mac80211: Fixed bug in mesh portal paths
net/mac80211: Correct size given to memset
b43: Remove reset after fatal DMA error
rtl8187: add radio led and fix warnings on suspend
... -
* 'compat-ioctl-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground:
usbdevfs: move compat_ioctl handling to devio.c
lp: move compat_ioctl handling into lp.c
compat_ioctl: pass compat pointer directly to handlers
compat_ioctl: simplify lookup table
compat_ioctl: simplify calling of handlers
compat_ioctl: inline all conversion handlers
compat_ioctl: Remove BKL
compat_ioctl: remove all VT ioctl handling -
* git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: add sys_recvmmsg to unistd.h
asm-generic: add sys_accept4 to unistd.h
asm-generic/gpio.h: add some forward decls of the device struct
asm-generic: Fix typo in asm-generic/unistd.h.
lib/checksum: fix one more thinko
lib/checksum.c: make do_csum optional
lib/checksum.c: use 32-bit arithmetic consistently -
…el/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
itimer: Fix the itimer trace print format
hrtimer: move timer stats helper functions to hrtimer.c
hrtimer: Tune hrtimer_interrupt hang logic -
…/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: Avoid out of bounds array reference in save_trace()
futex: Take mmap_sem for get_user_pages in fault_in_user_writeable
lockstat: Add usage info to Documentation/lockstat.txt
lockstat: Fix min, max times in /proc/lock_stats -
…git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/amd-iommu: Fix PCI hotplug with passthrough mode
x86/amd-iommu: Fix passthrough mode
x86: mmio-mod.c: Use pr_fmt
x86: kmmio.c: Add and use pr_fmt(fmt)
x86: i8254.c: Add pr_fmt(fmt)
x86: setup_percpu.c: Use pr_<level> and add pr_fmt(fmt)
x86: es7000_32.c: Use pr_<level> and add pr_fmt(fmt)
x86: Print DMI_BOARD_NAME as well as DMI_PRODUCT_NAME from __show_regs()
x86: Factor duplicated code out of __show_regs() into show_regs_common()
arch/x86/kernel/microcode*: Use pr_fmt() and remove duplicated KERN_ERR prefix
x86, mce: fix confusion between bank attributes and mce attributes
x86/mce: Set up timer unconditionally
x86: Fix bogus warning in apic_noop.apic_write()
x86: Fix typo in arch/x86/mm/kmmio.c
x86: ASUS P4S800 reboot=bios quirk -
…nel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Remove comparing of NULL to va_list in trace_array_vprintk()
tracing: Fix function graph trace_pipe to properly display failed entries
tracing: Add full state to trace_seq
tracing: Buffer the output of seq_file in case of filled buffer
tracing: Only call pipe_close if pipe_close is defined
tracing: Add pipe_close interface -
…/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (57 commits)
x86, perf events: Check if we have APIC enabled
perf_event: Fix variable initialization in other codepaths
perf kmem: Fix unused argument build warning
perf symbols: perf_header__read_build_ids() offset'n'size should be u64
perf symbols: dsos__read_build_ids() should read both user and kernel buildids
perf tools: Align long options which have no short forms
perf kmem: Show usage if no option is specified
sched: Mark sched_clock() as notrace
perf sched: Add max delay time snapshot
perf tools: Correct size given to memset
perf_event: Fix perf_swevent_hrtimer() variable initialization
perf sched: Fix for getting task's execution time
tracing/kprobes: Fix field creation's bad error handling
perf_event: Cleanup for cpu_clock_perf_event_update()
perf_event: Allocate children's perf_event_ctxp at the right time
perf_event: Clean up __perf_event_init_context()
hw-breakpoints: Modify breakpoints without unregistering them
perf probe: Update perf-probe document
perf probe: Support --del option
trace-kprobe: Support delete probe syntax
... -
* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
HTC Dream: mmc compilation fixes
video: Allow selecting MSM framebuffer in Kconfig
Add arm msm maintainer entry
msm: Add memory map for HTC Dream
msm: add minimal board file for HTC Dream device
msm: make debugging UART (for DEBUG_LL) configurable -
Conflicts:
include/net/tcp.h -
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[ACPI/CPUFREQ] Introduce bios_limit per cpu cpufreq sysfs interface
[CPUFREQ] make internal cpufreq_add_dev_* static
[CPUFREQ] use an enum for speedstep processor identification
[CPUFREQ] Document units for transition latency
[CPUFREQ] Use global sysfs cpufreq structure for conservative governor tunings
[CPUFREQ] Documentation: ABI: /sys/devices/system/cpu/cpu#/cpufreq/
[CPUFREQ] powernow-k6: set transition latency value so ondemand governor can be used
[CPUFREQ] cpumask: don't put a cpumask on the stack in x86...cpufreq/powernow-k8.c -
The debug batman option needs to depend on the correct
config option.Signed-off-by: Greg Kroah-Hartman
[ "No means no!" - Linus ]
Signed-off-by: Linus Torvalds
