lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

Browse Source 
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
  Kbuild: Fix deb-pkg target to work with kernel versions ending with -<text-without-digit>
  ide: introduce HAVE_IDE
  kbuild: silence CHK/UPD messages according to $(quiet)
  scsi: fix makefile for aic7(3*x)
  kbuild/modpost: Use warn() for announcing section mismatches
  Add binoffset to gitignore
  kbuild/modpost: improve warnings if symbol is unknown
This commit is contained in:
Linus Torvalds
2008-02-09 11:14:20 -08:00
parent acac103e2d ed2c9fa53b
commit 451688ba0b
29 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/alpha/Kconfig
View File

@@ -5,6 +5,7 @@
config ALPHA config ALPHA
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
help help
The Alpha is a 64-bit general-purpose processor designed and The Alpha is a 64-bit general-purpose processor designed and

19
arch/arm/Kconfig
View File

@@ -222,6 +222,7 @@ config ARCH_CLPS7500
select TIMER_ACORN select TIMER_ACORN
select ISA select ISA
select NO_IOPORT select NO_IOPORT
select HAVE_IDE
help help
Support for the Cirrus Logic PS7500FE system-on-a-chip. Support for the Cirrus Logic PS7500FE system-on-a-chip.
@@ -234,6 +235,7 @@ config ARCH_CO285
bool "Co-EBSA285" bool "Co-EBSA285"
select FOOTBRIDGE select FOOTBRIDGE
select FOOTBRIDGE_ADDIN select FOOTBRIDGE_ADDIN
select HAVE_IDE
help help
Support for Intel's EBSA285 companion chip. Support for Intel's EBSA285 companion chip.
@@ -258,6 +260,7 @@ config ARCH_EP93XX
config ARCH_FOOTBRIDGE config ARCH_FOOTBRIDGE
bool "FootBridge" bool "FootBridge"
select FOOTBRIDGE select FOOTBRIDGE
select HAVE_IDE
help help
Support for systems based on the DC21285 companion chip Support for systems based on the DC21285 companion chip
("FootBridge"), such as the Simtec CATS and the Rebel NetWinder. ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@ -296,6 +299,7 @@ config ARCH_IOP32X
depends on MMU depends on MMU
select PLAT_IOP select PLAT_IOP
select PCI select PCI
select HAVE_IDE
help help
Support for Intel's 80219 and IOP32X (XScale) family of Support for Intel's 80219 and IOP32X (XScale) family of
processors. processors.
@@ -305,12 +309,14 @@ config ARCH_IOP33X
depends on MMU depends on MMU
select PLAT_IOP select PLAT_IOP
select PCI select PCI
select HAVE_IDE
help help
Support for Intel's IOP33X (XScale) family of processors. Support for Intel's IOP33X (XScale) family of processors.
config ARCH_IXP23XX config ARCH_IXP23XX
bool "IXP23XX-based" bool "IXP23XX-based"
depends on MMU depends on MMU
select HAVE_IDE
select PCI select PCI
help help
Support for Intel's IXP23xx (XScale) family of processors. Support for Intel's IXP23xx (XScale) family of processors.
@@ -328,12 +334,14 @@ config ARCH_IXP4XX
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
select HAVE_IDE
help help
Support for Intel's IXP4XX (XScale) family of processors. Support for Intel's IXP4XX (XScale) family of processors.
config ARCH_L7200 config ARCH_L7200
bool "LinkUp-L7200" bool "LinkUp-L7200"
select FIQ select FIQ
select HAVE_IDE
help help
Say Y here if you intend to run this kernel on a LinkUp Systems Say Y here if you intend to run this kernel on a LinkUp Systems
L7200 Software Development Board which uses an ARM720T processor. L7200 Software Development Board which uses an ARM720T processor.
@@ -388,6 +396,7 @@ config ARCH_PXA
depends on MMU depends on MMU
select ARCH_MTD_XIP select ARCH_MTD_XIP
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_IDE
select HAVE_GPIO_LIB select HAVE_GPIO_LIB
select GENERIC_TIME select GENERIC_TIME
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
@@ -403,6 +412,7 @@ config ARCH_RPC
select ARCH_MAY_HAVE_PC_FDC select ARCH_MAY_HAVE_PC_FDC
select ISA_DMA_API select ISA_DMA_API
select NO_IOPORT select NO_IOPORT
select HAVE_IDE
help help
On the Acorn Risc-PC, Linux can support the internal IDE disk and On the Acorn Risc-PC, Linux can support the internal IDE disk and
CD-ROM interface, serial and parallel port, and the floppy drive. CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -414,12 +424,14 @@ config ARCH_SA1100
select ARCH_MTD_XIP select ARCH_MTD_XIP
select GENERIC_GPIO select GENERIC_GPIO
select GENERIC_TIME select GENERIC_TIME
select HAVE_IDE
help help
Support for StrongARM 11x0 based boards. Support for StrongARM 11x0 based boards.
config ARCH_S3C2410 config ARCH_S3C2410
bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443" bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_IDE
help help
Samsung S3C2410X CPU based systems, such as the Simtec Electronics Samsung S3C2410X CPU based systems, such as the Simtec Electronics
BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -427,6 +439,7 @@ config ARCH_S3C2410
config ARCH_SHARK config ARCH_SHARK
bool "Shark" bool "Shark"
select HAVE_IDE
select ISA select ISA
select ISA_DMA select ISA_DMA
select PCI select PCI
@@ -436,6 +449,7 @@ config ARCH_SHARK
config ARCH_LH7A40X config ARCH_LH7A40X
bool "Sharp LH7A40X" bool "Sharp LH7A40X"
select HAVE_IDE
help help
Say Y here for systems based on one of the Sharp LH7A40X Say Y here for systems based on one of the Sharp LH7A40X
System on a Chip processors. These CPUs include an ARM922T System on a Chip processors. These CPUs include an ARM922T
@@ -1093,12 +1107,7 @@ source "drivers/block/Kconfig"
source "drivers/misc/Kconfig" source "drivers/misc/Kconfig"
if PCMCIA || ARCH_CLPS7500 || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX \
|| ARCH_L7200 || ARCH_LH7A40X || ARCH_PXA || ARCH_RPC \
|| ARCH_S3C2410 || ARCH_SA1100 || ARCH_SHARK || FOOTBRIDGE \
|| ARCH_IXP23XX
source "drivers/ide/Kconfig" source "drivers/ide/Kconfig"
endif
source "drivers/scsi/Kconfig" source "drivers/scsi/Kconfig"

1
arch/avr32/Kconfig
View File

@@ -10,6 +10,7 @@ config AVR32
# With EMBEDDED=n, we get lots of stuff automatically selected # With EMBEDDED=n, we get lots of stuff automatically selected
# that we usually don't need on AVR32. # that we usually don't need on AVR32.
select EMBEDDED select EMBEDDED
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_KPROBES select HAVE_KPROBES
help help

1
arch/blackfin/Kconfig
View File

@@ -24,6 +24,7 @@ config RWSEM_XCHGADD_ALGORITHM
config BLACKFIN config BLACKFIN
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
config ZONE_DMA config ZONE_DMA

1
arch/cris/Kconfig
View File

@@ -54,6 +54,7 @@ config FORCE_MAX_ZONEORDER
config CRIS config CRIS
bool bool
default y default y
select HAVE_IDE
config HZ config HZ
int int

1
arch/frv/Kconfig
View File

@@ -5,6 +5,7 @@
config FRV config FRV
bool bool
default y default y
select HAVE_IDE
config ZONE_DMA config ZONE_DMA
bool bool

1
arch/h8300/Kconfig
View File

@@ -8,6 +8,7 @@ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
config H8300 config H8300
bool bool
default y default y
select HAVE_IDE
config MMU config MMU
bool bool

1
arch/ia64/Kconfig
View File

@@ -15,6 +15,7 @@ config IA64
select ACPI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM)
select PM if (!IA64_HP_SIM) select PM if (!IA64_HP_SIM)
select ARCH_SUPPORTS_MSI select ARCH_SUPPORTS_MSI
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_KPROBES select HAVE_KPROBES
default y default y

1
arch/m32r/Kconfig
View File

@@ -8,6 +8,7 @@ mainmenu "Linux/M32R Kernel Configuration"
config M32R config M32R
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
config SBUS config SBUS

1
arch/m68k/Kconfig
View File

@@ -5,6 +5,7 @@
config M68K config M68K
bool bool
default y default y
select HAVE_IDE
config MMU config MMU
bool bool

1
arch/m68knommu/Kconfig
View File

@@ -8,6 +8,7 @@ mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
config M68K config M68K
bool bool
default y default y
select HAVE_IDE
config MMU config MMU
bool bool

1
arch/mips/Kconfig
View File

@@ -1,6 +1,7 @@
config MIPS config MIPS
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
# Horrible source of confusion. Die, die, die ... # Horrible source of confusion. Die, die, die ...
select EMBEDDED select EMBEDDED

1
arch/parisc/Kconfig
View File

@@ -7,6 +7,7 @@ mainmenu "Linux/PA-RISC Kernel Configuration"
config PARISC config PARISC
def_bool y def_bool y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
help help
The PA-RISC microprocessor is designed by Hewlett-Packard and used The PA-RISC microprocessor is designed by Hewlett-Packard and used

1
arch/powerpc/Kconfig
View File

@@ -87,6 +87,7 @@ config ARCH_NO_VIRT_TO_BUS
config PPC config PPC
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_KPROBES select HAVE_KPROBES

1
arch/ppc/Kconfig
View File

@@ -42,6 +42,7 @@ config GENERIC_CALIBRATE_DELAY
config PPC config PPC
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_KPROBES select HAVE_KPROBES

1
arch/sh/Kconfig
View File

@@ -8,6 +8,7 @@ mainmenu "Linux/SuperH Kernel Configuration"
config SUPERH config SUPERH
def_bool y def_bool y
select EMBEDDED select EMBEDDED
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
help help
The SuperH is a RISC processor targeted for use in embedded systems The SuperH is a RISC processor targeted for use in embedded systems

1
arch/sparc/Kconfig
View File

@@ -69,6 +69,7 @@ config NR_CPUS
config SPARC config SPARC
bool bool
default y default y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
# Identify this as a Sparc32 build # Identify this as a Sparc32 build

1
arch/sparc64/Kconfig
View File

@@ -14,6 +14,7 @@ config SPARC
config SPARC64 config SPARC64
bool bool
default y default y
select HAVE_IDE
help help
SPARC is a family of RISC microprocessors designed and marketed by SPARC is a family of RISC microprocessors designed and marketed by
Sun Microsystems, incorporated. This port covers the newer 64-bit Sun Microsystems, incorporated. This port covers the newer 64-bit

1
arch/v850/Kconfig
View File

@@ -78,6 +78,7 @@ config MCA
config V850 config V850
bool bool
default y default y
select HAVE_IDE
menu "Processor type and features" menu "Processor type and features"

1
arch/x86/Kconfig
View File

@@ -18,6 +18,7 @@ config X86_64
### Arch settings ### Arch settings
config X86 config X86
def_bool y def_bool y
select HAVE_IDE
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_KPROBES select HAVE_KPROBES

1
arch/xtensa/Kconfig
View File

@@ -14,6 +14,7 @@ config ZONE_DMA
config XTENSA config XTENSA
bool bool
default y default y
select HAVE_IDE
help help
Xtensa processors are 32-bit RISC machines designed by Tensilica Xtensa processors are 32-bit RISC machines designed by Tensilica
primarily for embedded systems. These processors are both primarily for embedded systems. These processors are both

6
drivers/ide/Kconfig
View File

@@ -4,10 +4,14 @@
# Andre Hedrick <andre@linux-ide.org> # Andre Hedrick <andre@linux-ide.org>
# #
# Select HAVE_IDE if IDE is supported
config HAVE_IDE
def_bool n
menuconfig IDE menuconfig IDE
tristate "ATA/ATAPI/MFM/RLL support" tristate "ATA/ATAPI/MFM/RLL support"
depends on HAVE_IDE
depends on BLOCK depends on BLOCK
depends on HAS_IOMEM
---help--- ---help---
If you say Y here, your kernel will be able to manage low cost mass If you say Y here, your kernel will be able to manage low cost mass
storage units such as ATA/(E)IDE and ATAPI units. The most common storage units such as ATA/(E)IDE and ATAPI units. The most common

1
drivers/pcmcia/Kconfig
View File

@@ -38,6 +38,7 @@ config PCMCIA_DEBUG
config PCMCIA config PCMCIA
tristate "16-bit PCMCIA support" tristate "16-bit PCMCIA support"
select CRC32 select CRC32
select HAVE_IDE
default y default y
---help--- ---help---
This option enables support for 16-bit PCMCIA cards. Most older This option enables support for 16-bit PCMCIA cards. Most older

4
drivers/scsi/aic7xxx/Makefile
View File

@@ -44,8 +44,8 @@ clean-files += aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c
# Dependencies for generated files need to be listed explicitly # Dependencies for generated files need to be listed explicitly
$(addprefix $(src)/,$(aic7xxx-y:.o=.c)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h $(addprefix $(obj)/,$(aic7xxx-y)): $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h
$(addprefix $(src)/,$(aic79xx-y:.o=.c)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h $(addprefix $(obj)/,$(aic79xx-y)): $(obj)/aic79xx_seq.h $(obj)/aic79xx_reg.h
aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h aic7xxx-gen-$(CONFIG_AIC7XXX_BUILD_FIRMWARE) := $(obj)/aic7xxx_reg.h
aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c aic7xxx-gen-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) += $(obj)/aic7xxx_reg_print.c

4
init/Makefile
View File

@@ -27,7 +27,9 @@ $(obj)/version.o: include/linux/compile.h
# mkcompile_h will make sure to only update the # mkcompile_h will make sure to only update the
# actual file if its content has changed. # actual file if its content has changed.
quiet_chk_compile.h = echo ' CHK $@'
silent_chk_compile.h = :
include/linux/compile.h: FORCE include/linux/compile.h: FORCE
@echo ' CHK $@' @$($(quiet)chk_compile.h)
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
"$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)" "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"

1
scripts/.gitignore vendored
View File

@@ -6,3 +6,4 @@ kallsyms
pnmtologo pnmtologo
bin2c bin2c
unifdef unifdef
binoffset

8
scripts/Kbuild.include
View File

@@ -39,15 +39,19 @@ escsq = $(subst $(squote),'\$(squote)',$1)
# - If they are equal no change, and no timestamp update # - If they are equal no change, and no timestamp update
# - stdin is piped in from the first prerequisite ($<) so one has # - stdin is piped in from the first prerequisite ($<) so one has
# to specify a valid file as first prerequisite (often the kbuild file) # to specify a valid file as first prerequisite (often the kbuild file)
quiet_chk_filechk = echo ' CHK $@'
silent_chk_filechk = :
quiet_upd_filechk = echo ' UPD $@'
silent_upd_filechk = :
define filechk define filechk
$(Q)set -e; \ $(Q)set -e; \
echo ' CHK $@'; \ $($(quiet)chk_filechk); \
mkdir -p $(dir $@); \ mkdir -p $(dir $@); \
$(filechk_$(1)) < $< > $@.tmp; \ $(filechk_$(1)) < $< > $@.tmp; \
if [ -r $@ ] && cmp -s $@ $@.tmp; then \ if [ -r $@ ] && cmp -s $@ $@.tmp; then \
rm -f $@.tmp; \ rm -f $@.tmp; \
else \ else \
echo ' UPD $@'; \ $($(quiet)upd_filechk); \
mv -f $@.tmp $@; \ mv -f $@.tmp $@; \
fi fi
endef endef

37
scripts/mod/modpost.c
View File

@@ -613,7 +613,7 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym)
if (sym) if (sym)
return elf->strtab + sym->st_name; return elf->strtab + sym->st_name;
else else
return ""; return "(unknown)";
} }
static const char *sec_name(struct elf_info *elf, int shndx) static const char *sec_name(struct elf_info *elf, int shndx)
@@ -1102,7 +1102,7 @@ static int is_function(Elf_Sym *sym)
if (sym) if (sym)
return ELF_ST_TYPE(sym->st_info) == STT_FUNC; return ELF_ST_TYPE(sym->st_info) == STT_FUNC;
else else
return 0; return -1;
} }
/* /*
@@ -1120,24 +1120,31 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
{ {
const char *from, *from_p; const char *from, *from_p;
const char *to, *to_p; const char *to, *to_p;
from = from_is_func ? "function" : "variable";
from_p = from_is_func ? "()" : ""; switch (from_is_func) {
to = to_is_func ? "function" : "variable"; case 0: from = "variable"; from_p = ""; break;
to_p = to_is_func ? "()" : ""; case 1: from = "function"; from_p = "()"; break;
default: from = "(unknown reference)"; from_p = ""; break;
}
switch (to_is_func) {
case 0: to = "variable"; to_p = ""; break;
case 1: to = "function"; to_p = "()"; break;
default: to = "(unknown reference)"; to_p = ""; break;
}
sec_mismatch_count++; sec_mismatch_count++;
if (!sec_mismatch_verbose) if (!sec_mismatch_verbose)
return; return;
fprintf(stderr, "WARNING: %s(%s+0x%llx): Section mismatch in" warn("%s(%s+0x%llx): Section mismatch in reference from the %s %s%s "
" reference from the %s %s%s to the %s %s:%s%s\n", "to the %s %s:%s%s\n",
modname, fromsec, fromaddr, from, fromsym, from_p, modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec,
to, tosec, tosym, to_p); tosym, to_p);
switch (mismatch) { switch (mismatch) {
case TEXT_TO_INIT: case TEXT_TO_INIT:
fprintf(stderr, fprintf(stderr,
"The function %s %s() references\n" "The function %s%s() references\n"
"the %s %s%s%s.\n" "the %s %s%s%s.\n"
"This is often because %s lacks a %s\n" "This is often because %s lacks a %s\n"
"annotation or the annotation of %s is wrong.\n", "annotation or the annotation of %s is wrong.\n",
@@ -1938,10 +1945,10 @@ int main(int argc, char **argv)
if (dump_write) if (dump_write)
write_dump(dump_write); write_dump(dump_write);
if (sec_mismatch_count && !sec_mismatch_verbose) if (sec_mismatch_count && !sec_mismatch_verbose)
fprintf(stderr, "modpost: Found %d section mismatch(es).\n" warn("modpost: Found %d section mismatch(es).\n"
"To see full details build your kernel with:\n" "To see full details build your kernel with:\n"
"'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n", "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
sec_mismatch_count); sec_mismatch_count);
return err; return err;
} }

3
scripts/package/builddeb
View File

@@ -13,6 +13,7 @@ set -e
# Some variables and settings used throughout the script # Some variables and settings used throughout the script
version=$KERNELRELEASE version=$KERNELRELEASE
revision=`cat .version`
tmpdir="$objtree/debian/tmp" tmpdir="$objtree/debian/tmp"
packagename=linux-$version packagename=linux-$version
@@ -65,7 +66,7 @@ done
name="Kernel Compiler <$(id -nu)@$(hostname -f)>" name="Kernel Compiler <$(id -nu)@$(hostname -f)>"
# Generate a simple changelog template # Generate a simple changelog template
cat <<EOF > debian/changelog cat <<EOF > debian/changelog
linux ($version) unstable; urgency=low linux ($version-$revision) unstable; urgency=low
* A standard release * A standard release