30 Jul, 2011
2 commits
-
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
xconfig: Abort close if configuration cannot be saved
kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
kconfig/nconf: remove useless conditionnal
kconfig/nconf: prevent segfault on empty menu
kconfig/nconf: use the generic menu_get_ext_help()
nconfig: Avoid Wunused-but-set warning
kconfig/conf: mark xfgets() private
kconfig: remove pending prototypes for kconfig_load()
kconfig/conf: add command line options' description
kconfig/conf: reduce the scope of `defconfig_file'
kconfig: use calloc() for expr allocation
kconfig: introduce specialized printer
kconfig: do not overwrite symbol direct dependency in assignment
kconfig/gconf: silent missing prototype warnings
kconfig/gconf: kill deadcode
kconfig: nuke LKC_DIRECT_LINK cruft
kconfig: nuke reference to SWIG
kconfig: add missing inclusion
kconfig: add missing inclusion
...Fix up conflicts in scripts/kconfig/Makefile
-
Replace the config_is_*() macros with a variant that allows for grepping
for usage of CONFIG_* options in the code. Usage:if (IS_ENABLED(CONFIG_NUMA))
or
#if IS_ENABLED(CONFIG_NUMA)
The IS_ENABLED() macro evaluates to 1 if the argument is set (to either 'y'
or 'm'), IS_BUILTIN() tests if the option is 'y' and IS_MODULE() test if
the option is 'm'. Only boolean and tristate options are supported.Reviewed-by: Arnaud Lacombe
Acked-by: Randy Dunlap
Signed-off-by: Michal Marek
26 Jul, 2011
11 commits
-
* Merge akpm patch series: (122 commits)
drivers/connector/cn_proc.c: remove unused local
Documentation/SubmitChecklist: add RCU debug config options
reiserfs: use hweight_long()
reiserfs: use proper little-endian bitops
pnpacpi: register disabled resources
drivers/rtc/rtc-tegra.c: properly initialize spinlock
drivers/rtc/rtc-twl.c: check return value of twl_rtc_write_u8() in twl_rtc_set_time()
drivers/rtc: add support for Qualcomm PMIC8xxx RTC
drivers/rtc/rtc-s3c.c: support clock gating
drivers/rtc/rtc-mpc5121.c: add support for RTC on MPC5200
init: skip calibration delay if previously done
misc/eeprom: add eeprom access driver for digsy_mtc board
misc/eeprom: add driver for microwire 93xx46 EEPROMs
checkpatch.pl: update $logFunctions
checkpatch: make utf-8 test --strict
checkpatch.pl: add ability to ignore various messages
checkpatch: add a "prefer __aligned" check
checkpatch: validate signature styles and To: and Cc: lines
checkpatch: add __rcu as a sparse modifier
checkpatch: suggest using min_t or max_t
...Did this as a merge because of (trivial) conflicts in
- Documentation/feature-removal-schedule.txt
- arch/xtensa/include/asm/uaccess.h
that were just easier to fix up in the merge than in the patch series. -
Previous behavior allowed only alphabetic prefixes like pr_info to exceed
the 80 column line length limit.ath6kl wants to add a digit into the prefix, so allow numbers as well as
digits in the _ printks.__ratelimited and __once and WARN_RATELIMIT
and WARN_ONCE may now exceed 80 cols.Add missing _printk type for completeness.
Signed-off-by: Joe Perches
Cc: Andy Whitcroft
Cc: Kalle Valo
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Some patches are sent in using ISO-8859 or even Windows codepage 1252.
Make checkpatch accept these by default and only emit the "Invalid UTF-8"
message when using --strict.Signed-off-by: Joe Perches
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Some users would like the ability to not emit some of the messages that
checkpatch produces. This can make it easier to use checkpatch in other
projects and integrate into scm hook scripts.Add command line option to "--ignore" various message types. Add option
--show-types to emit the "type" of each message. Categorize all ERROR,
WARN and CHK messages with types.Add optional .checkpatch.conf file to store default options.
3 paths are searched for .checkpatch.conf
. customized per-tree configurations
$HOME user global configuration when per-tree configs don't exist
./scripts lk defaults to override script
The .conf file can contain any valid command-line argument and
the contents are prepended to any additional command line arguments.
Multiple lines may be used, blank lines are ignored, # is a comment.Update "false positive" output for readability.
Update version to 0.32
Signed-off-by: Joe Perches
Acked-by: Mike Frysinger
Cc: Andy Whitcroft
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Prefer the use of __aligned(size) over __attribute__((__aligned___(size)))
Link: http://lkml.kernel.org/r/20110609094526.1571774c.akpm@linux-foundation.org
Suggested-by: Andrew Morton
Signed-off-by: Joe Perches
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signatures have many forms and can sometimes cause problems if not in the
correct format when using git send-email or quilt.Try to verify the signature tags and email addresses to use the generally
accepted "Signed-off-by: Full Name " form.Original idea by Anish Kumar
Signed-off-by: Joe Perches
Cc: Anish Kumar
Cc: Nick Bowler
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Fix "need consistent spacing around '*'" error after a __rcu sparse
annotation which was caused by the missing __rcu entry in the
checkpatch.pl internal list of sparse keywords.Signed-off-by: Sven Eckelmann
Cc: Andy Whitcroft
Cc: Joe Perches
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
A common issue with min() or max() is using a cast on one or both of the
arguments when using min_t/max_t could be better.Add cast detection to uses of min/max and suggest an appropriate use of
min_t or max_t instead.Caveat: This only works for min() or max() on a single line.
It does not find min() or max() split across multiple lines.This does find:
min((u32)foo, bar);
But it does not find:
max((unsigned long)foo,
bar);Suggested-by: Andrew Morton
Signed-off-by: Joe Perches
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Entries that used formats other than "Proper Name "
were not parsed properly.Try to improve the parsing so that the entries in the forms of:
Proper Name
and
Proper Name Commit Name
are transformed correctly.Signed-off-by: Joe Perches
Reviewed-by: Florian Mickler
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
…linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
genksyms: Use same type in loop comparison
kbuild: silence generated makefile message
kernel: prevent unnecessary rebuilding due to config_data.gz
headers_install: fix __packed in exported kernel headers
dtc: regen parser
dtc: migrate parser to implicit rules
kconfig: regen parser
kconfig: migrate parser to implicit rules
kconfig/zconf.l: do not ask to generate backup
kconfig: kill no longer needed reference to YYDEBUG
kconfig: constify `kconf_id_lookup'
genksym: regen parser
genksyms: migrate parser to implicit rules
genksyms: drop -Wno-uninitialized from HOSTCFLAGS_parse.tab.o
genksyms: pass hash and lookup functions name and target language though the input file
kbuild: simplify the %_shipped rule
kbuild: add implicit rules for parser generation
kbuild: add `baseprereq'
kbuild: Fix reference to vermagic.h* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
package: Makefile: fix perf target bug* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
gitignore: ignore debian build directory -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
25 Jul, 2011
2 commits
-
Give the user an opportunity to fix the error or save the configuration
under a different path.Reported-by: Hiromu Yakura
Signed-off-by: Michal Marek -
The ARRAY_SIZE macro in scripts/genksyms/genksyms.c returns a value of
type size_t. That value is being compared to a variable of type int in
a loop in read_node(). Change the int variable to size_t type as well,
so we don't do signed vs unsigned type comparisons with all the
potential promotion/sign extension trouble that can cause (also
silences compiler warnings at high levels of warnings).Signed-off-by: Jesper Juhl
Signed-off-by: Michal Marek
24 Jul, 2011
1 commit
-
The commit f02e8a6 sorts symbols placing each of them in its own elf section.
The sorting and merging into the canonical sections are done by the linker.
Unfortunately modpost to generate Module.symvers file parses vmlinux
(already linked) and all modules object files (which aren't linked yet).
These aren't sanitized by the linker yet. That breaks modpost that can't
detect license properly for modules. This patch makes modpost aware of
the new exported symbols structure.Thanks to Arnaud Lacombe and Anders Kaseorg
for providing useful suggestions about code.This work was supported by a hardware donation from the CE Linux Forum.
Reported-by: Jan Beulich
Signed-off-by: Alessio Igor Bogani
Signed-off-by: Rusty Russell
20 Jul, 2011
1 commit
-
This patch silences the "make -C /usr/src/git O=/usr/src/git/build/."
message shown when using the generated makefile in KBUILD_OUTDIR.Signed-off-by: Peter Foley
Signed-off-by: Michal Marek
18 Jul, 2011
1 commit
-
The specialized printer for headers (espectially autoconf.h) is missing
fixup code for S_HEX symbol's "0x" prefix. As long as kconfig does not
warn for such missing prefix, this code is needed. Fix this.In the same time, fix some nits in `header_print_symbol()'.
Cc: Randy Dunlap
Cc: Mauro Carvalho ChehabBroken-by: Arnaud Lacombe
Reported-by: Randy Dunlap
Reported-by: Mauro Carvalho Chehab
Acked-by: Mauro Carvalho Chehab
Acked-by: Randy Dunlap
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek
14 Jul, 2011
1 commit
-
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
kbuild: Do not write to builddir in modules_install
13 Jul, 2011
4 commits
-
After the test
if (!submenu || ...)
continue;the variable `submenu' can _not_ be NULL, so do not test for this
situation.Cc: Nir Tzachar
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek -
nconf does not check the validity of the current menu when help is
requested (with either , '?' or 'h'). This leads to a NULL pointer
dereference when an empty menu is encountered.The following reduced testcase exposes the problem:
config DEP
boolmenu "FOO"
config BAR
bool "BAR"
depends on DEPendmenu
Issue will happen when entering menu "FOO" and requesting help.
nconf is the only front-end which do not filter the validity of the
current menu. Such filter can not really happen beforehand as other key
which does not deals with the current menu might be entered by the user,
so just bails out earlier if we encounter an invalid menu.Cc: Nir Tzachar
Cc: Andrej Gelenberg
Reported-by: Andrej Gelenberg
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek -
nconf is the only front-end which does not use this helper, but prefer
to copy/paste the code. The test wrt. menu validity added in this
version of the code is bogus anyway as an invalid menu will get
dereferenced a few line below by calling menu_get_prompt().For now, convert nconf to use menu_get_ext_help(), as do every other
front-end. We will deals with menu validity checks properly in a
separate commit.Cc: Nir Tzachar
Cc: Andrej Gelenberg
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek -
I am seeing Wunused-but-set warning while make nconfig. Looks like
active_menu is not used. Removing it fixes the warning.Signed-off-by: Raghavendra D Prabhu
Acked-by: WANG Cong
Signed-off-by: Michal Marek
12 Jul, 2011
1 commit
-
Let depmod.sh create a temporary directory in /tmp instead of writing to
the build directory as root. The mktemp utility should be available on
any recent system (and there is already scripts/gen_initramfs_list.sh
relying on it).Reported-by: Christian Kujau
Signed-off-by: Michal Marek
11 Jul, 2011
1 commit
-
Sync with Linus' tree to be able to apply pending patches that
are based on newer code already present upstream.
04 Jul, 2011
1 commit
02 Jul, 2011
5 commits
-
This function has not much reason to be public. In the mean time, convert
declaration from K&R C to ISO C.Signed-off-by: Arnaud Lacombe
-
Commit 5a6f8d2bd9e3392569ed6f29ea4d7210652f929b removed `kconfig_load()',
however, it missed an hidden prototypes in `lkc.h'. Fix this.Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
-
This variable is not used outside of main() so there is not much reason keeping
it global. Ensure it is initialized as gcc has no way to know that normal
execution path expect only one option switch to be given on the command line
(except when we request help). As a result, we always initialize
`defconfig_file' before using it.Signed-off-by: Arnaud Lacombe
-
Signed-off-by: Arnaud Lacombe
01 Jul, 2011
1 commit
-
Make conf_write_symbol() grammar agnostic to be able to use it from different
code path. These path pass a printer callback which will print a symbol's name
and its value in different format.conf_write_symbol()'s job become mostly only to prepare a string for the
printer. This avoid to have to pass specialized flag to generic
functionsSigned-off-by: Arnaud Lacombe
[mmarek: rebased on top of de12518 (kconfig: autogenerated config_is_xxx
macro)]
Signed-off-by: Michal Marek
24 Jun, 2011
4 commits
-
Considering the following configuration:
config F
bool "F"choice AB
bool "AB"
config A
bool "A"
config B
bool "B"
endchoiceif A
config D
bool
default y if F
select E
config E
bool "E"
endifif B
config D
bool
default y if F
select E
config E
bool "E"
endifThe following configuration:
CONFIG_F=y
CONFIG_A=y
# CONFIG_B is not set
CONFIG_D=y
CONFIG_E=yemits a spurious warning:
(D) selects E which has unmet direct dependencies (B)
If a symbol appears in two different branch of the tree, it should inherit the
dependency of both parent, not just the last one.Reported-by: Yann E. Morin
Tested-by: Yann E. Morin
Signed-off-by: Arnaud Lacombe
Signed-off-by: Michal Marek -
checkpatch.pl warns about using __attribute__((packed)) in kernel
headers: "__packed is preferred over __attribute__((packed))". If one
follows that advice it could cause problems in the exported header
files, because the outside world doesn't know about this shortcut.For example busybox will fail to compile:
CC miscutils/ubi_attach_detach.o
In file included from miscutils/ubi_attach_detach.c:27:0:
/usr/include/mtd/ubi-user.h:330:3: error: conflicting types for ‘__packed’
/usr/include/mtd/ubi-user.h:314:3: note: previous declaration of ‘__packed’ was here
...Fix the problem by substituting __packed with __attribute__((packed)) in
the header_install.pl script.Cc: Artem Bityutskiy
CC: Joe Perches
Signed-off-by: Markus Trippelsdorf
Signed-off-by: Michal Marek -
Specify --git-dir when building perf targets to allow out-of-tree
builds using O=.The shell command in `git archive' had to be modified to allow proper
file name expansion of the files listed in MANIFEST.Signed-off-by: matt mooney
Signed-off-by: Michal Marek
17 Jun, 2011
1 commit
-
The placement of the opening brace "{" after 'if' statements in
scripts/docproc.c is inconsistent. Most are placed on the same line as the 'if'
statement itself as per CodingStyle, but a few are not. This patch cleans up
the inconsistency. We save a few source lines and the file then uses the same
style throughout, which is nice.Signed-off-by: Jesper Juhl
Signed-off-by: Jiri Kosina
16 Jun, 2011
2 commits
-
Signed-off-by: Jonathan Neuschäfer
Signed-off-by: Jiri Kosina -
Warn about uses of printk_ratelimit() because it uses a global state and
can hide subsequent useful messages.Signed-off-by: Joe Perches
Cc: Andy Whitcroft
Cc: Richard Weinberger
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
13 Jun, 2011
1 commit
-
This patch removes the assumption of the bootgraph.pl script that the
timing information reported by PRINTK_TIME will contain at least one
entry with a time of less than 100 seconds.Not all boards correctly reset the system timer and in many cases the
inital times reported by PRINTK_TIME is high. When this occurs the
bootchart.pl script fails to give any useful output.This patch sets the $firsttime variable to the largest value expected
by PRINTK_TIMESigned-off-by: Andrew Murray
Acked-by: Arjan van de Ven
Signed-off-by: Jiri Kosina
