10 Jun, 2009

32 commits

  • Correct the regular expression in scripts/headers_check.pl to include '_'
    as a valid character in the class; otherwise, the check will report a
    "leaked" symbol of CONFIG_A_B_C as merely CONFIG_A.

    This patch will make no difference whatsoever in the current kernel tree
    as the call to the perl routine that does that check is currently
    commented out:

    &check_include();
    &check_asm_types();
    &check_sizetypes();
    &check_prototypes();
    # Dropped for now. Too much noise &check_config();

    However, I noticed that problem when I was building the yum downloadable
    kernel source rpm for fedora 11 (beta), which *does* run that check, and
    that's where the problem became obvious.

    Signed-off-by: Robert P. J. Day
    Cc: David Woodhouse
    Signed-off-by: Andrew Morton
    Signed-off-by: Sam Ravnborg

    Robert P. J. Day
     
  • Fix coding style whitespace issues and replace __initcall with
    device_initcall. Fixed multi-line comments as per coding style.

    Errors as reported by checkpatch.pl :-
    Before:
    total: 14 errors, 14 warnings, 487 lines checked
    After :
    total: 0 errors, 8 warnings, 507 lines checked

    Compile tested binary verified as :-
    Before:
    text data bss dec hex filename
    2405 4 0 2409 969 kernel/kallsyms.o
    After :
    text data bss dec hex filename
    2405 4 0 2409 969 kernel/kallsyms.o

    Signed-off-by: Manish Katiyar
    Signed-off-by: Andrew Morton
    Signed-off-by: Sam Ravnborg

    Manish Katiyar
     
  • Regardless of KCONFIG_AUTOCONFIG, the filename written as a Make target
    into "include/config/auto.conf.cmd" was always the default one.

    Of course this doesn't make it work for the Kernel kbuild system, since
    there the filename is hardcoded at several places in the Makefiles.

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • Rather than hardcoding ".config" use conf_get_configname(), which also
    respects the environment variable KCONFIG_CONFIG.

    This fixes "make silentoldconfig" when KCONFIG_CONFIG is used and also
    suggests the given filename for "Load" and "Save as" in qconf.

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • QApplication::desktop() returns a pointer to QDesktopWidget, not to
    QWidget.

    Fixes the following compiler error after a quick conversion with 'qt3to4',
    which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.

    scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
    scripts/kconfig/qconf.cc:1289: error: cannot convert 'QDesktopWidget*' to 'QWidget*' in initialization

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • They are defined in the 'Qt' namespace.

    Fixes the following compiler errors after a quick conversion with 'qt3to4',
    which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.

    scripts/kconfig/qconf.cc: In member function 'virtual void ConfigLineEdit::keyPressEvent(QKeyEvent*)':
    scripts/kconfig/qconf.cc:311: error: 'Key_Escape' was not declared in this scope
    scripts/kconfig/qconf.cc:313: error: 'Key_Return' was not declared in this scope
    scripts/kconfig/qconf.cc:314: error: 'Key_Enter' was not declared in this scope

    scripts/kconfig/qconf.cc: In member function 'virtual void ConfigList::keyPressEvent(QKeyEvent*)':
    scripts/kconfig/qconf.cc:653: error: 'Key_Escape' was not declared in this scope
    scripts/kconfig/qconf.cc:666: error: 'Key_Return' was not declared in this scope
    scripts/kconfig/qconf.cc:667: error: 'Key_Enter' was not declared in this scope
    scripts/kconfig/qconf.cc:681: error: 'Key_Space' was not declared in this scope
    scripts/kconfig/qconf.cc:684: error: 'Key_N' was not declared in this scope
    scripts/kconfig/qconf.cc:687: error: 'Key_M' was not declared in this scope
    scripts/kconfig/qconf.cc:690: error: 'Key_Y' was not declared in this scope

    scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
    scripts/kconfig/qconf.cc:1329: error: 'CTRL' was not declared in this scope
    scripts/kconfig/qconf.cc:1329: error: 'Key_Q' was not declared in this scope
    scripts/kconfig/qconf.cc:1331: error: 'Key_L' was not declared in this scope
    scripts/kconfig/qconf.cc:1333: error: 'Key_S' was not declared in this scope
    scripts/kconfig/qconf.cc:1340: error: 'Key_F' was not declared in this scope

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • They were used as QSplitter::Horizontal resp. QSplitter::Vertical, but
    are defined in the 'Qt' namespace.

    Fixes the following compiler errors after a quick conversion with 'qt3to4',
    which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.

    scripts/kconfig/qconf.cc: In constructor 'ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow*, const char*)':
    scripts/kconfig/qconf.cc:1213: error: 'Vertical' is not a member of 'QSplitter'

    scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
    scripts/kconfig/qconf.cc:1304: error: 'Horizontal' is not a member of 'QSplitter'
    scripts/kconfig/qconf.cc:1311: error: 'Vertical' is not a member of 'QSplitter'

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • These compiler warnings occure when adding -Wall to HOSTCXXFLAGS in
    /Makefile

    scripts/kconfig/qconf.h: In constructor ‘ConfigInfoView::ConfigInfoView(QWidget*, const char*)’:
    scripts/kconfig/qconf.h:274: warning: ‘ConfigInfoView::menu’ will be initialized after
    scripts/kconfig/qconf.h:273: warning: ‘symbol* ConfigInfoView::sym’
    scripts/kconfig/qconf.cc:922: warning: when initialized here

    scripts/kconfig/qconf.cc: In member function ‘void ConfigMainWindow::setMenuLink(menu*)’:
    scripts/kconfig/qconf.cc:1498: warning: enumeration value ‘menuMode’ not handled in switch
    scripts/kconfig/qconf.cc:1498: warning: enumeration value ‘listMode’ not handled in switch

    scripts/kconfig/qconf.cc: In member function ‘void ConfigMainWindow::saveSettings()’:
    scripts/kconfig/qconf.cc:1664: warning: enumeration value ‘menuMode’ not handled in switch
    scripts/kconfig/qconf.cc:1664: warning: enumeration value ‘listMode’ not handled in switch

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • All the KCONFIG_ environment variables were previously located in a
    section "Environment variables in 'menuconfig'", but neither are they
    restricted to 'menuconfig' nor are they all used by 'menuconfig'.

    Introduce the following three sections for these variables:
    * Environment variables for '*config'
    * Environment variables for '{allyes/allmod/allno/rand}config'
    * Environment variables for 'silentoldconfig'

    Furthermore this puts MENUCONFIG_MODE next to MENUCONFIG_COLOR into a
    common section "User interface options for 'menuconfig'".

    Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • Signed-off-by: Markus Heidelberg
    Signed-off-by: Sam Ravnborg

    Markus Heidelberg
     
  • The GNU make's origin function know undefined variable well,
    so the outer ifdef/endif conditional checking is unneeded.

    From `info make` documentation, origin will return

    `undefined'
    if VARIABLE was never defined.
    `command line'
    if VARIABLE was defined on the command line.
    ...

    Therefore, $(origin V) will get a value anyway, killing ifdef/endif is
    viable and safe.

    Furthermore, I've checked the minimal requirements from
    Documentation/Changes is GNU make 3.79.1, and that version of GNU make
    has support of origin function well already, so now it's safe to kill
    the outer conditional checking, without upgrading the minimal
    requirements.

    Signed-off-by: Cheng Renquan
    Signed-off-by: Sam Ravnborg

    Cheng Renquan
     
  • There is an error in the make syntax for one of the kbuild examples

    Signed-off-by: David VomLehn
    Signed-off-by: Sam Ravnborg

    David VomLehn
     
  • - getcwd returns path without a slash at the end, add the slash
    - add KBUILD_SRC env support, so that we can specify path for
    kernel (to know where scripts/kernel-doc resides) and SRCTREE
    (for searching files referenced in .tmpl) separately

    [v2]
    - use KBUILD_SRC instead of a newly introduced environment variable

    Signed-off-by: Jiri Slaby
    Acked-by: Randy Dunlap
    Signed-off-by: Sam Ravnborg

    Jiri Slaby
     
  • 'drop' variable is unused.

    'ppc' and 'sparc64' directories don't exist in arch/,
    and I think their headers can be well exported now, so
    just remove them.

    Signed-off-by: WANG Cong
    Signed-off-by: Sam Ravnborg

    Amerigo Wang
     
  • - add .init.rodata to INIT_DATA, and group all initconst flavors
    together
    - move strings generated from __setup_param() into .init.rodata
    - add .*init.rodata to modpost's sets of init sections
    - make modpost warn about references between meminit and cpuinit
    as well as memexit and cpuexit sections (as CPU and memory
    hotplug are independently selectable features)

    Signed-off-by: Jan Beulich
    Signed-off-by: Sam Ravnborg

    Jan Beulich
     
  • Latest Debian policy is 3.8.1.
    Even if we are not yet compliant to it strive for the latest.

    Signed-off-by: maximilian attems
    Signed-off-by: Frans Pop
    Acked-by: Andres Salomon
    Signed-off-by: Sam Ravnborg

    maximilian attems
     
  • Section "base" has been removed, the base is defined by Priority field.

    For Squeeze the section should be "kernel", but as that's not yet
    supported for Sarge and Etch we stay with admin for now.

    Signed-off-by: maximilian attems
    Signed-off-by: Frans Pop
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    maximilian attems
     
  • kernel-image naming has been dropped for the Lenny release
    and was only transitional for Etch.

    As it builds modules it provides linux-modules-$version.

    Signed-off-by: maximilian attems
    Signed-off-by: Frans Pop
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    maximilian attems
     
  • The binary package that make deb-pkg creates is a linux-image.
    To be fixed may also be the addition of $DEB_ARCH.

    Signed-off-by: maximilian attems
    Signed-off-by: Frans Pop
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    maximilian attems
     
  • The Source: field is defined as the source package in the package
    archive from which a binary packages are built. As deb-pkg does not
    generate a source package, we should avoid to use any existing source
    packages here.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Try harder to find email and maintainer name.
    Debian's own devscripts all use DEBEMAIL or DEBFULLNAME prior to an
    eventual EMAIL or NAME environment variable. Match their logic.

    "Anonymous" sounds nicer then "Kernel Compiler" if no name is found.

    Signed-off-by: maximilian attems
    Signed-off-by: Frans Pop
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    maximilian attems
     
  • On Thursday 23 April 2009, Frans Pop wrote:
    Add a basic debian/copyright to the binary packages.

    Based on an earlier patch from Maximilian Attems.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Hook scripts in the default directory /etc/kernel are also executed by
    official Debian kernel packages as well as kernel packages created using
    make-kpkg. Allow to specify an alternative hook scripts directory by
    exporting the environment variable KDEB_HOOKDIR.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Allow to specify a custom revision for the generated .deb by
    exporting the environment variable KDEB_PKGVERSION.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • The Debian packaging scripts created by the deb-pkg target do not pass
    on the standard Debian maintainer script parameters to hook scripts,
    which means that those scripts cannot tell whether they are being called
    during e.g. install vs. upgrade, or removal vs. purge of the package.

    As there are several variantions in how hook scripts are called from
    kernel packages, we pass the parameters in the environment variable
    DEB_MAINT_PARAMS rather than as extra arguments.

    Bump version of builddep script to 1.3.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Not all architectures prepend the $(boot) path in $(KBUILD_IMAGE).
    Allow for that fact in the builddeb script. Example is arm.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Factor out code to build package into separate function and
    only write "source" section for the debian/control file once.

    Signed-off-by: Frans Pop
    Acked-by: maximilian attems
    Cc: Andres Salomon
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Minor coding style improvements and typo fix in leading comment.

    Signed-off-by: Frans Pop
    Cc: Andres Salomon
    Acked-by: maximilian attems
    Signed-off-by: Sam Ravnborg

    Frans Pop
     
  • Implement support for comment entries within choice groups. Comment entries
    are displayed visually distinct from normal configs, and selecting them is
    a no-op.

    Signed-off-by: Peter Korsgaard
    Cc: Roman Zippel
    Signed-off-by: Sam Ravnborg

    Peter Korsgaard
     

09 Jun, 2009

5 commits

  • Our async work synchronization was broken by "async: make sure
    independent async domains can't accidentally entangle" (commit
    d5a877e8dd409d8c702986d06485c374b705d340), because it would report
    the wrong lowest active async ID when there was both running and
    pending async work.

    This caused things like no being able to read the root filesystem,
    resulting in missing console devices and inability to run 'init',
    causing a boot-time panic.

    This fixes it by properly returning the lowest pending async ID: if
    there is any running async work, that will have a lower ID than any
    pending work, and we should _not_ look at the pending work list.

    There were alternative patches from Jaswinder and James, but this one
    also cleans up the code by removing the pointless 'ret' variable and
    the unnecesary testing for an empty list around 'for_each_entry()' (if
    the list is empty, the for_each_entry() thing just won't execute).

    Fixes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=13474
    Reported-and-tested-by: Chris Clayton
    Cc: Jaswinder Singh Rajput
    Cc: James Bottomley
    Cc: Arjan van de Ven
    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
    MIPS: Outline udelay and fix a few issues.
    MIPS: ioctl.h: Fix headers_check warnings
    MIPS: Cobalt: PCI bus is always required to obtain the board ID
    MIPS: Kconfig: Remove "Support for" from Cavium system type
    MIPS: Sibyte: Honor CONFIG_CMDLINE
    SSB: BCM47xx: Export ssb_watchdog_timer_set

    Linus Torvalds
     
  • The previous patch submission had a I typo I didn't catch but Bartlomiej
    noted. Guess this proves the point about any patch being risky late in an rc

    Signed-off-by: Alan Cox
    Signed-off-by: Linus Torvalds

    Alan Cox
     
  • * 'kvm-updates/2.6.30' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
    KVM: Explicity initialize cpus_hardware_enabled

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
    pdc202xx_old: fix resetproc() method
    pdc202xx_old: fix 'pdc20246_dma_ops'

    Linus Torvalds
     

08 Jun, 2009

3 commits