]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Mon, 20 Sep 2010 12:12:00 +0000 (12:12 +0000)]
Merge branch 'kconfig' into for-next

13 years agokconfig: fix menuconfig on debian lenny
Junio C Hamano [Sun, 19 Sep 2010 02:25:32 +0000 (19:25 -0700)]
kconfig: fix menuconfig on debian lenny

In 60f33b8 (kconfig: get rid of stray a.o, support ncursesw, 2006-01-15),
support to link menuconfig with ncursesw library was added.  To compute
the linker command option -l, we check "libncursesw.{so,a,dylib}" to allow
ncursesw to be used as a replacement ncurses.  However, when checking what
header file to include, we do not check /usr/include/ncursesw directory.

Add /usr/include/ncursesw to the list of directories that are checked.
With this patch, on my Debian Lenny box with libncursesw5-dev package but
not libncurses5-dev package, I can say "make menuconfig".

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Fri, 17 Sep 2010 16:21:05 +0000 (16:21 +0000)]
Merge branch 'kconfig' into for-next

13 years agoMerge branch 'kbuild' into for-next
Michal Marek [Fri, 17 Sep 2010 16:21:03 +0000 (16:21 +0000)]
Merge branch 'kbuild' into for-next

13 years agoscripts: Enable error messages while hush up unnecessary warnings
Jean Sacren [Sat, 11 Sep 2010 05:13:33 +0000 (23:13 -0600)]
scripts: Enable error messages while hush up unnecessary warnings

As no error was handled, we wouldn't be able to know when an error does
occur. The fix preserves error messages while it doesn't let unnecessary
compiling warnings show up.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoscripts/kconfig/gconf.glade Update broken web addresses.
Justin P. Mattock [Mon, 13 Sep 2010 19:55:56 +0000 (12:55 -0700)]
scripts/kconfig/gconf.glade Update broken web addresses.

As discussed, remove the DOCTYPE declaration since libglade validates
the file against itself..

Signed-off-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kbuild' into for-next
Michal Marek [Mon, 13 Sep 2010 15:23:06 +0000 (15:23 +0000)]
Merge branch 'kbuild' into for-next

13 years agoMerge branch 'kbuild/clean' into kbuild/kbuild
Michal Marek [Mon, 13 Sep 2010 15:20:59 +0000 (17:20 +0200)]
Merge branch 'kbuild/clean' into kbuild/kbuild

13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Mon, 13 Sep 2010 15:18:25 +0000 (15:18 +0000)]
Merge branch 'kconfig' into for-next

13 years agokconfig: Simplify Makefile for xconfig
Michal Marek [Mon, 13 Sep 2010 11:41:31 +0000 (13:41 +0200)]
kconfig: Simplify Makefile for xconfig

Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoFix QT4 moc, cflags libs detection on dual QT3/Qt4 systems
Alexander Stein [Fri, 10 Sep 2010 17:01:14 +0000 (19:01 +0200)]
Fix QT4 moc, cflags libs detection on dual QT3/Qt4 systems

On system with QT3 and QT4 qmake in PATH may be from QT3. So we use
pkg-config for proper QT4 detection.
By reqesting cflags and libs for either QtCore, QtGui and QtSupport include
dirs and libs get listed several times, but so we won't mis anything

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agonconfig: Fix help for choice menus
Stephen Boyd [Fri, 10 Sep 2010 08:32:50 +0000 (01:32 -0700)]
nconfig: Fix help for choice menus

When getting the help for a choice menu with a help section (for example
the "Choose SLAB allocator" menu) nconfig pops up a window with nothing
inside it. This is due to show_help() passing an empty string to
show_scroll_win()'s 3rd argument. The option really does have help
though, but it isn't a config symbol, so just add the help text for
the option, and don't try to add anything else like the config option
name.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Nir Tzachar <nir.tzachar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Wed, 8 Sep 2010 11:57:14 +0000 (11:57 +0000)]
Merge branch 'kconfig' into for-next

13 years agokbuild: fix oldnoconfig to do the right thing
Kyle McMartin [Wed, 1 Sep 2010 15:21:30 +0000 (11:21 -0400)]
kbuild: fix oldnoconfig to do the right thing

Commit 861b4ea4 broke oldnoconfig when removed the oldnoconfig checks on
                       if (input_mode == nonint_oldconfig ||
                           input_mode == oldnoconfig) {
                               if (input_mode == nonint_oldconfig &&
                                   sym->name &&
                                    !sym_is_choice_value(sym)) {
to avoid oldnoconfig chugging through the else stanza.

Fix that to restore expected behaviour (which I've confirmed in the
Fedora kernel build that the configs end up looking the same.)

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'packaging' into for-next
Michal Marek [Mon, 6 Sep 2010 11:34:26 +0000 (11:34 +0000)]
Merge branch 'packaging' into for-next

13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Mon, 6 Sep 2010 11:34:24 +0000 (11:34 +0000)]
Merge branch 'kconfig' into for-next

13 years agoMerge branch 'kbuild' into for-next
Michal Marek [Mon, 6 Sep 2010 11:34:23 +0000 (11:34 +0000)]
Merge branch 'kbuild' into for-next

13 years agoxconfig: Change the titlebar if using Qt3
Michal Marek [Wed, 1 Sep 2010 15:39:27 +0000 (17:39 +0200)]
xconfig: Change the titlebar if using Qt3

Qt4 is now used by default and will get more testing. In case someone
still uses Qt3 and reports a bug, make it easy to recognize that this is
Qt3.

Acked-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it
Guillem Jover [Fri, 3 Sep 2010 02:33:28 +0000 (04:33 +0200)]
kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it

Avoid an error when doing cp over the image when it does not contain
the full path to the file.

Signed-off-by: Guillem Jover <guillem@hadrons.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoscripts/setlocalversion: update comment
Michael Prokop [Mon, 6 Sep 2010 09:57:19 +0000 (11:57 +0200)]
scripts/setlocalversion: update comment

A tagged repository state isn't enough, git describe only
looks at signed or annotated tags (git tag -a/-s). This
documentation update makes sure the comment matches the
current behaviour.

Signed-off-by: Michael Prokop <mika@grml.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild: Use a single clean rule for kernel and external modules
Michal Marek [Mon, 6 Sep 2010 10:00:08 +0000 (12:00 +0200)]
kbuild: Use a single clean rule for kernel and external modules

The list of patterns for the external modules case was constantly
lagging behind.

Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild: Do not run make clean in $(srctree)
Michal Marek [Fri, 3 Sep 2010 13:00:22 +0000 (15:00 +0200)]
kbuild: Do not run make clean in $(srctree)

Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Wed, 1 Sep 2010 15:39:12 +0000 (15:39 +0000)]
Merge branch 'kconfig' into for-next

13 years agokconfig qconf: port to QT4
Alexander Stein [Tue, 31 Aug 2010 15:34:37 +0000 (17:34 +0200)]
kconfig qconf: port to QT4

A straight forward port to QT4 using qt3to4 and compiling against
  qt3support

* Use pkg-config to detect QT4 which is hopefully portable enough
* If no QT4, QT3 will by tried instead
* Classes renamed using qt3to4
  * If build using QT3 renamed to QT3 class names using defines
* ConfigInfoView::menu has to be renamed as QT4 moc strips struct from
  struct menu and creates a name conflict
* QT2 support has been dropped
* The hidden options inserted in 39a4897c1bb66e8a36043c105d7fd73d8b32b480
  are use in native API

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'misc' into for-next
Michal Marek [Wed, 1 Sep 2010 13:02:34 +0000 (13:02 +0000)]
Merge branch 'misc' into for-next

13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Wed, 1 Sep 2010 13:02:33 +0000 (13:02 +0000)]
Merge branch 'kconfig' into for-next

13 years agoMerge branch 'kbuild' into for-next
Michal Marek [Wed, 1 Sep 2010 13:02:31 +0000 (13:02 +0000)]
Merge branch 'kbuild' into for-next

13 years agokbuild: use getopt_long(), not its _only() variant
Arnaud Lacombe [Mon, 23 Aug 2010 16:01:24 +0000 (12:01 -0400)]
kbuild: use getopt_long(), not its _only() variant

NetBSD lacks getopt_long_only() whereas getopt_long() works just fine.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add misc/ifcol.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:12 +0000 (17:39 +0200)]
Coccinelle: Add misc/ifcol.cocci

Find confusingly indented code in or after an if.  An if branch should
be indented.  The code following an if should not be indented.
Sometimes, code after an if that is indented is actually intended to be
part of the if branch.

This has a high rate of false positives, because Coccinelle's column
calculation does not distinguish between spaces and tabs, so code that
is not visually aligned may be considered to be in the same column.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add misc/doubleinit.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:11 +0000 (17:39 +0200)]
Coccinelle: Add misc/doubleinit.cocci

Find duplicate field initializations.  This has a high rate of false
positives due to #ifdefs, which Coccinelle is not aware of in a structure
initialization.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Move alloc directory into api directory
Nicolas Palix [Tue, 24 Aug 2010 15:39:10 +0000 (17:39 +0200)]
Coccinelle: Move alloc directory into api directory

alloc contains various semantic patches related
to the allocation APIs

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Move resource_size.cocci to the api directory
Nicolas Palix [Tue, 24 Aug 2010 15:39:09 +0000 (17:39 +0200)]
Coccinelle: Move resource_size.cocci to the api directory

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Move err_cast.cocci to the api directory
Nicolas Palix [Tue, 24 Aug 2010 15:39:08 +0000 (17:39 +0200)]
Coccinelle: Move err_cast.cocci to the api directory

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add api/memdup_user
Nicolas Palix [Tue, 24 Aug 2010 15:39:07 +0000 (17:39 +0200)]
Coccinelle: Add api/memdup_user

Use kmemdup_user rather than duplicating its implementation
This is a little bit restricted to reduce false positives

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add api/memdup.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:06 +0000 (17:39 +0200)]
Coccinelle: Add api/memdup.cocci

Use kmemdup rather than duplicating its implementation

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add api/kstrdup.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:05 +0000 (17:39 +0200)]
Coccinelle: Add api/kstrdup.cocci

Use kstrdup rather than duplicating its implementation

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add free/kfree.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:04 +0000 (17:39 +0200)]
Coccinelle: Add free/kfree.cocci

Find a use after free.  Values of variables may imply that some
execution paths are not possible, resulting in false positives.
Another source of false positives are macros such as
SCTP_DBG_OBJCNT_DEC that do not actually evaluate their argument

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add iterators/list_entry_update.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:03 +0000 (17:39 +0200)]
Coccinelle: Add iterators/list_entry_update.cocci

list_for_each_entry uses its first argument to get from one element of
the list to the next, so it is usually not a good idea to reassign it.
The first rule finds such a reassignment and the second rule checks
that there is a path from the reassignment back to the top of the loop.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add iterators/itnull.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:02 +0000 (17:39 +0200)]
Coccinelle: Add iterators/itnull.cocci

Many iterators have the property that the first argument is always bound
to a real list element, never NULL.  False positives arise for some
iterators that do not have this property, or in cases when the loop
cursor is reassigned.  The latter should only happen when the matched
code is on the way to a loop exit (break, goto, or return).

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add iterators/fen.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:01 +0000 (17:39 +0200)]
Coccinelle: Add iterators/fen.cocci

for_each_node iterators only exit normally when the loop cursor is
NULL, so there is no point to call of_node_put on the final value.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add locks/mini_lock.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:39:00 +0000 (17:39 +0200)]
Coccinelle: Add locks/mini_lock.cocci

Find missing unlocks.  This semantic match considers the specific case
where the unlock is missing from an if branch, and there is a lock
before the if and an unlock after the if.  False positives are due to
cases where the if branch represents a case where the function is
supposed to exit with the lock held, or where there is some preceding
function call that releases the lock.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add locks/double_lock.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:38:59 +0000 (17:38 +0200)]
Coccinelle: Add locks/double_lock.cocci

Find double locks.  False positives may occur when some paths cannot
occur at execution, due to the values of variables, and when there is
an intervening function call that releases the lock.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add locks/call_kern.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:38:58 +0000 (17:38 +0200)]
Coccinelle: Add locks/call_kern.cocci

Find functions that refer to GFP_KERNEL but are called with locks held.
The proposed change of converting the GFP_KERNEL is not necessarily the
correct one.  It may be desired to unlock the lock, or to not call the
function under the lock in the first place.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Move deref_null.cocci to a more appropriate directory
Nicolas Palix [Tue, 24 Aug 2010 15:38:57 +0000 (17:38 +0200)]
Coccinelle: Move deref_null.cocci to a more appropriate directory

deref_null.cocci is moved to the 'null' directory
which contains other null related rules.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add null/kmerr.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:38:56 +0000 (17:38 +0200)]
Coccinelle: Add null/kmerr.cocci

This semantic patch looks for kmalloc etc that are not followed by a
NULL check.  It only gives a report in the case where there is some
error handling code later in the function, which may be helpful
in determining what the error handling code for the call to kmalloc etc
should be.

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoCoccinelle: Add null/eno.cocci
Nicolas Palix [Tue, 24 Aug 2010 15:38:55 +0000 (17:38 +0200)]
Coccinelle: Add null/eno.cocci

The various basic memory allocation functions don't return ERR_PTR

Signed-off-by: Nicolas Palix <npalix@diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild: don't overwrite HOST_EXTRACFLAGS
Arnaud Lacombe [Mon, 23 Aug 2010 00:03:06 +0000 (20:03 -0400)]
kbuild: don't overwrite HOST_EXTRACFLAGS

This might be used by the user to specify extra arguments for the host
compiler.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoscripts/mod/modpost.c: fix commentary accordingly to last changes
Andy Shevchenko [Tue, 17 Aug 2010 10:36:40 +0000 (13:36 +0300)]
scripts/mod/modpost.c: fix commentary accordingly to last changes

The last commits
 37ed19d5cce35a40d3913cf9aa208ce9f60db3d7
 5003bab82d56754b27be01eef24495a02e00039d
have introduced new behaviour of sec2annotation() method. However, the
commentary inside the method was left as before. Let's fix it accordingly.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'rc-fixes' into for-next
Michal Marek [Sat, 21 Aug 2010 13:19:15 +0000 (13:19 +0000)]
Merge branch 'rc-fixes' into for-next

13 years agosetlocalversion: Ignote SCMs above the linux source tree
Michal Marek [Mon, 16 Aug 2010 15:09:52 +0000 (17:09 +0200)]
setlocalversion: Ignote SCMs above the linux source tree

Dan McGee <dpmcgee@gmail.com> writes:
> Note that when in git, you get the appended "+" sign. If
> LOCALVERSION_AUTO is set, you will get something like
> "eee-gb01b08c-dirty" (whereas the copy of the tree in /tmp still
> returns "eee"). It doesn't matter whether the working tree is dirty or
> clean.
>
> Is there a way to disable this? I'm building from a clean tarball that
> just happens to be unpacked inside a git repository. One would think
> setting LOCALVERSION_AUTO to false would do it, but no such luck...

Fix this by checking if the kernel source tree is the root of the git or
hg repository. No fix for svn: If the kernel source is not tracked in
the svn repository, it works as expected, otherwise determining the
'repository root' is not really a defined task.

Reported-and-tested-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'rc-fixes' into for-next
Michal Marek [Fri, 20 Aug 2010 12:01:41 +0000 (12:01 +0000)]
Merge branch 'rc-fixes' into for-next

13 years agomakefile: not need to regenerate kernel.release file when make kernelrelease
Amerigo Wang [Fri, 20 Aug 2010 09:36:06 +0000 (05:36 -0400)]
makefile: not need to regenerate kernel.release file when make kernelrelease

Brice reported that 'kernelrelease' has a dependence on include/config/kernel.release,
causes this file to be regenerated every time when invoke it. It doesn't have to.

Reported-by: Brice Goglin <Brice.Goglin@inria.fr>
Tested-by: Brice Goglin <Brice.Goglin@inria.fr>
Signed-off-by: WANG Cong <amwang@redhat.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Michal Marek [Fri, 20 Aug 2010 11:53:08 +0000 (13:53 +0200)]
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes

13 years agoMerge branch 'rc-fixes' into for-next
Michal Marek [Tue, 17 Aug 2010 09:52:25 +0000 (09:52 +0000)]
Merge branch 'rc-fixes' into for-next

13 years agofixes for using make 3.82
Jan Beulich [Mon, 16 Aug 2010 10:58:58 +0000 (11:58 +0100)]
fixes for using make 3.82

It doesn't like pattern and explicit rules to be on the same line,
and it seems to be more picky when matching file (or really directory)
names with different numbers of trailing slashes.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Andrew Benton <b3nton@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Tue, 17 Aug 2010 09:03:52 +0000 (09:03 +0000)]
Merge branch 'kconfig' into for-next

13 years agokbuild: fix typo
Arnaud Lacombe [Mon, 16 Aug 2010 04:19:06 +0000 (00:19 -0400)]
kbuild: fix typo

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild: don't include `check-lxdialog' ldflags in global HOST_LOADLIBES
Arnaud Lacombe [Mon, 16 Aug 2010 04:19:04 +0000 (00:19 -0400)]
kbuild: don't include `check-lxdialog' ldflags in global HOST_LOADLIBES

On BSD systems, `check-lxdialog' would select -lcurses as the default
curses library which would conflict with -lncurses at runtime: curses'
compatible symbols are getting handled by the system's curses library while the
ncurses-specific symbols are getting handled by the ports' ncurses.

This fixes `nconf' segmentation fault on these systems.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agokbuild: confdata.c explicitly reference errno, thus need <errno.h>
Arnaud Lacombe [Tue, 17 Aug 2010 05:40:20 +0000 (01:40 -0400)]
kbuild: confdata.c explicitly reference errno, thus need <errno.h>

This fixes:
% gmake LKC_GENPARSER=1 menuconfig
[...]
scripts/kconfig/confdata.c:739: error: 'errno' undeclared (first use in this function)
scripts/kconfig/confdata.c:739: error: (Each undeclared identifier is reported only once
scripts/kconfig/confdata.c:739: error: for each function it appears in.)
scripts/kconfig/confdata.c:739: error: 'ENOENT' undeclared (first use in this function)

triggered on NetBSD.

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Mon, 16 Aug 2010 20:30:05 +0000 (20:30 +0000)]
Merge branch 'kconfig' into for-next

13 years agonconfig: add search support
Nir Tzachar [Sun, 8 Aug 2010 13:50:06 +0000 (16:50 +0300)]
nconfig: add search support

Remove the old hotkeys feature, and replace it by an interactive string
search.
From nconfig help:

Searching: pressing '/' triggers interactive search mode.
           nconfig performs a case insensitive search for the string
           in the menu prompts (no regex support).
           Pressing the up/down keys highlights the previous/next
           matching item. Backspace removes one character from the
           match string. Pressing either '/' again or ESC exits
           search mode. All other keys behave normally.

Miscellaneous other changes (including Rundy's and Justin's input).

Signed-off-by: Nir Tzachar <nir.tzachar@gmail.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
13 years agoLinux 2.6.36-rc1 v2.6.36-rc1
Linus Torvalds [Mon, 16 Aug 2010 00:41:37 +0000 (17:41 -0700)]
Linux 2.6.36-rc1

13 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
Linus Torvalds [Mon, 16 Aug 2010 00:37:07 +0000 (17:37 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  gcc-4.6: ACPI: fix unused but set variables in ACPI
  ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI processor: remove deprecated ACPI procfs I/F
  ACPI power_resource: remove unused procfs I/F
  ACPI: remove deprecated ACPI procfs I/F
  ACPI: introduce drivers/acpi/sysfs.c
  ACPI: introduce module parameter acpi.aml_debug_output
  ACPI: introduce drivers/acpi/debugfs.c
  ACPI, APEI, ERST debug support
  ACPI, APEI, Manage GHES as platform devices
  ACPI, APEI, Rename CPER and GHES severity constants
  ACPI, APEI, Fix a typo of error path of apei_resources_request
  ACPI / ACPICA: Fix reference counting problems with GPE handlers
  ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
  ACPI / Sleep: Drop acpi_suspend_finish()
  ACPI / Sleep: Consolidate suspend and hibernation routines
  ACPI / Wakeup: Simplify enabling of wakeup devices
  ACPI / Sleep: Rework enabling wakeup devices
  ACPI / Sleep: Free NVS copy if suspending of devices fails

Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
patch that doesn't even compile in the merge.

Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
breakage before I even pulled.  And a big "Grrr.." at Len for not even
bothering to compile the tree before asking me to pull.

13 years agoMerge git://git.infradead.org/iommu-2.6
Linus Torvalds [Mon, 16 Aug 2010 00:34:20 +0000 (17:34 -0700)]
Merge git://git.infradead.org/iommu-2.6

* git://git.infradead.org/iommu-2.6:
  intel-iommu: Fix 32-bit build warning with __cmpxchg()
  intr-remap: allow disabling source id checking

13 years agoMerge git://git.infradead.org/mtd-2.6
Linus Torvalds [Mon, 16 Aug 2010 00:32:47 +0000 (17:32 -0700)]
Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6:
  mtd/nand_ids: Fix buswidth
  mtd/m25p80: fix test for end of loop
  mtd/m25p80: retlen is never NULL
  MIPS: Fix gen_nand probe structures contents
  gen_nand: Test if nr_chips field is valid
  BFIN: Fix gen_nand probe structures contents
  nand/denali: move all hardware initialization work to denali_hw_init
  nand/denali: Add a page check in denali_read_page & denali_read_page_raw
  nand/denali: use cpu_relax() while waiting for hardware interrupt
  nand/denali: change read_status function method
  nand/denali: Fixed check patch warnings
  ARM: Fix gen_nand probe structures contents
  mtd/nand_base: fix kernel-doc warnings & typos
  nand/denali: use dev_xx debug function to replace nand_dbg_print and some printk
  nand/denali: Fixed handle ECC error bugs
  nand/denali: use iowrite32() to replace denali_write32()
  nand/denali: Fixed probe function bugs

13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Linus Torvalds [Mon, 16 Aug 2010 00:31:43 +0000 (17:31 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: don't validate CROSS_COMPILE needlessly
  arch/tile: export only COMMAND_LINE_SIZE to userspace.
  arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
  arch/tile: Rename the hweight() implementations to __arch_hweight()
  arch/tile: extend syscall ABI to set r1 on return as well.
  arch/tile: Various cleanups.
  arch/tile: support backtracing on TILE-Gx
  arch/tile: Fix a couple of issues with the COMPAT code for TILE-Gx.
  arch/tile: Use separate, better minsec values for clocksource and sched_clock.
  arch/tile: correct a bug in freeing bootmem by VA for the optional second initrd.
  arch: tile: mm: pgtable.c: Removed duplicated #include
  arch: tile: kernel/proc.c Removed duplicated #include
  Add fanotify syscalls to <asm-generic/unistd.h>.
  arch/tile: support new kunmap_atomic() naming convention.
  tile: remove unused ISA_DMA_THRESHOLD define

Conflicts in arch/tile/configs/tile_defconfig (pick the mainline version
with the reduced defconfig).

13 years agoarch/tile: don't validate CROSS_COMPILE needlessly
Chris Metcalf [Sun, 15 Aug 2010 19:01:45 +0000 (15:01 -0400)]
arch/tile: don't validate CROSS_COMPILE needlessly

With this change, the arch/tile Makefile will only check for a valid
combination of CROSS_COMPILE vs "uname -m" for a few common targets
that are typically the ones we get wrong (vmlinux, all, and modules).
The change handles the case of an empty "make" goal like "make all".

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
13 years agomm: fix up some user-visible effects of the stack guard page
Linus Torvalds [Sun, 15 Aug 2010 18:35:52 +0000 (11:35 -0700)]
mm: fix up some user-visible effects of the stack guard page

This commit makes the stack guard page somewhat less visible to user
space. It does this by:

 - not showing the guard page in /proc/<pid>/maps

   It looks like lvm-tools will actually read /proc/self/maps to figure
   out where all its mappings are, and effectively do a specialized
   "mlockall()" in user space.  By not showing the guard page as part of
   the mapping (by just adding PAGE_SIZE to the start for grows-up
   pages), lvm-tools ends up not being aware of it.

 - by also teaching the _real_ mlock() functionality not to try to lock
   the guard page.

   That would just expand the mapping down to create a new guard page,
   so there really is no point in trying to lock it in place.

It would perhaps be nice to show the guard page specially in
/proc/<pid>/maps (or at least mark grow-down segments some way), but
let's not open ourselves up to more breakage by user space from programs
that depends on the exact deails of the 'maps' file.

Special thanks to Henrique de Moraes Holschuh for diving into lvm-tools
source code to see what was going on with the whole new warning.

Reported-and-tested-by: François Valenduc <francois.valenduc@tvcablenet.be
Reported-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Linus Torvalds [Sun, 15 Aug 2010 18:22:00 +0000 (11:22 -0700)]
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: sound/usb/format: silence uninitialized variable warnings
  MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices
  MAINTAINERS: Make Wolfson entry also cover CODEC drivers
  ASoC: Only tweak WM8994 chip configuration on devices up to rev D
  ASoC: Optimise DSP performance for WM8994
  ALSA: hda - Fix dynamic ADC change working again
  ALSA: hda - Restrict PCM parameters per ELD information over HDMI
  sound: oss: sh_dac_audio.c removed duplicated #include

13 years agoMerge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
Linus Torvalds [Sun, 15 Aug 2010 18:17:52 +0000 (11:17 -0700)]
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: recognize Lincroft Atom Processor
  intel_idle: no longer EXPERIMENTAL
  intel_idle: disable module support
  intel_idle: add support for Westmere-EX
  intel_idle: delete power_policy modparam, and choose substate functions
  intel_idle: delete substates DEBUG modparam

13 years agoarch/tile: export only COMMAND_LINE_SIZE to userspace.
Chris Metcalf [Sun, 15 Aug 2010 16:14:41 +0000 (12:14 -0400)]
arch/tile: export only COMMAND_LINE_SIZE to userspace.

This fixes a failure in "make headers_check" for tile.
I hadn't realized this file was exported to userspace by default.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
13 years agoarch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN
Chris Metcalf [Sat, 14 Aug 2010 00:43:39 +0000 (20:43 -0400)]
arch/tile: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN

See commit a6eb9fe105d5de0053b261148cee56c94b4720ca.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
13 years agoMerge branch 'fix/asoc' into for-linus
Takashi Iwai [Sun, 15 Aug 2010 12:34:02 +0000 (14:34 +0200)]
Merge branch 'fix/asoc' into for-linus

13 years agoMerge branch 'fix/hda' into for-linus
Takashi Iwai [Sun, 15 Aug 2010 12:33:56 +0000 (14:33 +0200)]
Merge branch 'fix/hda' into for-linus

13 years agoALSA: sound/usb/format: silence uninitialized variable warnings
Dan Carpenter [Sat, 14 Aug 2010 17:29:53 +0000 (19:29 +0200)]
ALSA: sound/usb/format: silence uninitialized variable warnings

Gcc complains that ret might be used uninitialized:

sound/usb/format.c: In function ‘snd_usb_parse_audio_format’:
sound/usb/format.c:354: warning: ‘ret’ may be used uninitialized in this function
sound/usb/format.c:354: note: ‘ret’ was declared here
sound/usb/format.c:414: warning: ‘ret’ may be used uninitialized in this function
sound/usb/format.c:414: note: ‘ret’ was declared here

I suppose it could be uninitialized if there is ever a UAC_VERSION_3
released. Anyway this patch is worthwhile if only to silence the gcc
warning.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
13 years agoMerge branch 'linus' into release
Len Brown [Sun, 15 Aug 2010 05:06:31 +0000 (01:06 -0400)]
Merge branch 'linus' into release

Conflicts:
drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>
13 years agogcc-4.6: ACPI: fix unused but set variables in ACPI
Andi Kleen [Tue, 20 Jul 2010 22:18:36 +0000 (15:18 -0700)]
gcc-4.6: ACPI: fix unused but set variables in ACPI

Some minor improvements in error handling, but overall it was mostly dead
code.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
Zhang Rui [Thu, 15 Jul 2010 02:46:44 +0000 (10:46 +0800)]
ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS

Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/
is already available and has been working for years w/o any problem.

The ACPI thermal procfs I/F will be removed in 2.6.37.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
Zhang Rui [Thu, 15 Jul 2010 02:46:43 +0000 (10:46 +0800)]
ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS

Mark ACPI video driver procfs I/F deprecated, including:
/proc/acpi/video/*/info
/proc/acpi/video/*/DOS
/proc/acpi/video/*/ROM
/proc/acpi/video/*/POST
/proc/acpi/video/*/POST_info
/proc/acpi/video/*/*/info
/proc/acpi/video/*/*/state
/proc/acpi/video/*/*/EDID
and
/proc/acpi/video/*/*/brightness, because
1. we already have the sysfs I/F /sysclass/backlight/ as the replacement
of /proc/acpi/video/*/*/brightness.
2. the other procfs I/F is not useful for userspace.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI processor: remove deprecated ACPI procfs I/F
Zhang Rui [Thu, 15 Jul 2010 02:46:41 +0000 (10:46 +0800)]
ACPI processor: remove deprecated ACPI procfs I/F

Remove deprecated ACPI processor procfs I/F, including:
/proc/acpi/processor/CPUX/power
/proc/acpi/processor/CPUX/limit
/proc/acpi/processor/CPUX/info

/proc/acpi/processor/CPUX/throttling still exists,
as we don't have sysfs I/F available for now.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI power_resource: remove unused procfs I/F
Zhang Rui [Thu, 15 Jul 2010 02:46:38 +0000 (10:46 +0800)]
ACPI power_resource: remove unused procfs I/F

Remove unused ACPI power procfs I/F.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI: remove deprecated ACPI procfs I/F
Zhang Rui [Thu, 15 Jul 2010 02:46:33 +0000 (10:46 +0800)]
ACPI: remove deprecated ACPI procfs I/F

Rmove deprecated ACPI procfs I/F, including
/proc/acpi/debug_layer
/proc/acpi/debug_level
/proc/acpi/info
/proc/acpi/dsdt
/proc/acpi/fadt
/proc/acpi/sleep

because the sysfs I/F is already available
and has been working well for years.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI: introduce drivers/acpi/sysfs.c
Zhang Rui [Thu, 15 Jul 2010 02:46:30 +0000 (10:46 +0800)]
ACPI: introduce drivers/acpi/sysfs.c

Introduce drivers/acpi/sysfs.c.

code for ACPI sysfs I/F, including
#ifdef ACPI_DEBUG
/sys/module/acpi/parameters/debug_layer
/sys/module/acpi/parameters/debug_level
/sys/module/acpi/parameters/trace_method_name
/sys/module/acpi/parameters/trace_debug_layer
/sys/module/acpi/parameters/trace_debug_level
/sys/module/acpi/parameters/trace_state
#endif
/sys/module/acpi/parameters/acpica_version
/sys/firmware/acpi/tables/
/sys/firmware/acpi/interrupts/
is moved to this file.

No function change in this patch.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoMerge branch 'acpica-gpe' into release
Len Brown [Sun, 15 Aug 2010 04:25:40 +0000 (00:25 -0400)]
Merge branch 'acpica-gpe' into release

13 years agoMerge branch 'bugzilla-16422' into release
Len Brown [Sun, 15 Aug 2010 03:57:32 +0000 (23:57 -0400)]
Merge branch 'bugzilla-16422' into release

13 years agoMerge branch 'procfs-cleanup' into release
Len Brown [Sun, 15 Aug 2010 03:55:57 +0000 (23:55 -0400)]
Merge branch 'procfs-cleanup' into release

13 years agoMerge branch 'apei' into release
Len Brown [Sun, 15 Aug 2010 03:55:47 +0000 (23:55 -0400)]
Merge branch 'apei' into release

13 years agoMerge branch 'nvs' into release
Len Brown [Sun, 15 Aug 2010 03:55:44 +0000 (23:55 -0400)]
Merge branch 'nvs' into release

13 years agoACPI: introduce module parameter acpi.aml_debug_output
Zhang Rui [Thu, 15 Jul 2010 02:46:17 +0000 (10:46 +0800)]
ACPI: introduce module parameter acpi.aml_debug_output

Introduce module parameter acpi.aml_debug_output.

With acpi.aml_debug_output set, we can get AML debug object output
(Store (AAA, Debug)), even with CONFIG_ACPI_DEBUG cleared.

Together with the runtime custom method mechanism,
we can debug AML code problems without rebuilding the kernel.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI: introduce drivers/acpi/debugfs.c
Zhang Rui [Thu, 15 Jul 2010 02:46:15 +0000 (10:46 +0800)]
ACPI: introduce drivers/acpi/debugfs.c

Introduce drivers/acpi/debugfs.c.

Code for ACPI debugfs I/F,
i.e. /sys/kernel/debug/acpi/custom_method,
is moved to this file.

And make ACPI debugfs always built in,
even if CONFIG_ACPI_DEBUG is cleared.

BTW:this adds about 400bytes code to ACPI, when
CONFIG_ACPI_DEBUG is cleared.

[uaccess.h build fix from Andrew Morton <akpm@linux-foundation.org>]

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agointel_idle: recognize Lincroft Atom Processor
Arjan van de Ven [Thu, 22 Jul 2010 03:42:25 +0000 (23:42 -0400)]
intel_idle: recognize Lincroft Atom Processor

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoACPI, APEI, ERST debug support
Huang Ying [Thu, 12 Aug 2010 03:55:17 +0000 (11:55 +0800)]
ACPI, APEI, ERST debug support

This patch adds debugging/testing support to ERST. A misc device is
implemented to export raw ERST read/write/clear etc operations to user
space. With this patch, we can add ERST testing support to
linuxfirmwarekit ISO (linuxfirmwarekit.org) to verify the kernel
support and the firmware implementation.

Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
13 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup
Linus Torvalds [Sat, 14 Aug 2010 23:21:50 +0000 (16:21 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/cleanup:
  defconfig reduction
  kbuild: drop unifdef-y support
  archs: replace unifdef-y with header-y
  include: replace unifdef-y with header-y

13 years agofusion: add function parameter names to kernel-doc
Randy Dunlap [Sat, 14 Aug 2010 20:05:57 +0000 (13:05 -0700)]
fusion: add function parameter names to kernel-doc

Fix fusion missing kernel-doc:

  Warning(drivers/message/fusion/mptbase.c:649): No description found for parameter 'func_name'
  Warning(drivers/message/fusion/mptbase.c:8010): No description found for parameter 'cb_idx'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agofs/dcache: fix function param name in kernel-doc
Randy Dunlap [Sat, 14 Aug 2010 20:05:31 +0000 (13:05 -0700)]
fs/dcache: fix function param name in kernel-doc

Fix parameter name in kernel-doc notation (causes a warning).

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agofusion: fix non-kernel-doc comment block
Randy Dunlap [Sat, 14 Aug 2010 20:05:50 +0000 (13:05 -0700)]
fusion: fix non-kernel-doc comment block

Fix comment begin notation not to look like kernel-doc
since it's not.  Removes kernel-doc warnings.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agomm/page-writeback: fix non-kernel-doc function comments
Randy Dunlap [Sat, 14 Aug 2010 20:05:17 +0000 (13:05 -0700)]
mm/page-writeback: fix non-kernel-doc function comments

Remove leading /** from non-kernel-doc function comments to prevent
kernel-doc warnings.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoDocumentation: move SCSI parameters to their own text file
Randy Dunlap [Sat, 14 Aug 2010 19:36:14 +0000 (12:36 -0700)]
Documentation: move SCSI parameters to their own text file

Move SCSI parameters from kernel-parameters.txt to their own text file.

This continues a trend of moving non-core parameters out of
kernel-parameters.txt.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
13 years agoMerge branch 'kconfig' into for-next
Michal Marek [Sat, 14 Aug 2010 22:37:40 +0000 (22:37 +0000)]
Merge branch 'kconfig' into for-next

13 years agokconfig: fix segfault when detecting recursive dependency
Sam Ravnborg [Sat, 14 Aug 2010 12:40:00 +0000 (14:40 +0200)]
kconfig: fix segfault when detecting recursive dependency

Following sample Kconfig generated a segfault:

config FOO
        bool
        select PERF_EVENTS if HAVE_HW_BREAKPOINT

config PERF_EVENTS
        bool

config HAVE_HW_BREAKPOINT
        bool
        depends on PERF_EVENTS

Fix by reverting back to a valid property if there was no
property on the stack of symbols.

The above pattern were seen in sh Kconfig.
A fix for the Kconfig file has been sent to the sh folks.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>