Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] x86: Export _proxy_pda for gcc 4.2 [PATCH] i386: Don't use the TSC in sched_clock if unstable [PATCH] x86-64: fix section mismatch warnings [PATCH] i386: Enforce GPLness of VMI ROM [PATCH] x86-64: wire up compat sched_rr_get_interval(2) [PATCH] i386: Update defconfig [PATCH] x86-64: Update defconfig
This commit is contained in:
Linus Torvalds
Коммит
360afb0332
|
|
@ -1,10 +1,13 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.20-git8
|
||||
# Tue Feb 13 11:25:18 2007
|
||||
# Linux kernel version: 2.6.21-rc3
|
||||
# Wed Mar 7 15:29:47 2007
|
||||
#
|
||||
CONFIG_X86_32=y
|
||||
CONFIG_GENERIC_TIME=y
|
||||
CONFIG_CLOCKSOURCE_WATCHDOG=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
|
||||
CONFIG_LOCKDEP_SUPPORT=y
|
||||
CONFIG_STACKTRACE_SUPPORT=y
|
||||
CONFIG_SEMAPHORE_SLEEPERS=y
|
||||
|
|
@ -34,6 +37,7 @@ CONFIG_LOCALVERSION_AUTO=y
|
|||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
# CONFIG_IPC_NS is not set
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
# CONFIG_TASKSTATS is not set
|
||||
|
|
@ -44,6 +48,7 @@ CONFIG_IKCONFIG_PROC=y
|
|||
# CONFIG_CPUSETS is not set
|
||||
CONFIG_SYSFS_DEPRECATED=y
|
||||
# CONFIG_RELAY is not set
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_SYSCTL=y
|
||||
|
|
@ -103,6 +108,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
|
|||
#
|
||||
# Processor type and features
|
||||
#
|
||||
# CONFIG_TICK_ONESHOT is not set
|
||||
# CONFIG_NO_HZ is not set
|
||||
# CONFIG_HIGH_RES_TIMERS is not set
|
||||
CONFIG_SMP=y
|
||||
# CONFIG_X86_PC is not set
|
||||
# CONFIG_X86_ELAN is not set
|
||||
|
|
@ -235,10 +243,8 @@ CONFIG_ACPI_PROCFS=y
|
|||
CONFIG_ACPI_AC=y
|
||||
CONFIG_ACPI_BATTERY=y
|
||||
CONFIG_ACPI_BUTTON=y
|
||||
# CONFIG_ACPI_HOTKEY is not set
|
||||
CONFIG_ACPI_FAN=y
|
||||
# CONFIG_ACPI_DOCK is not set
|
||||
# CONFIG_ACPI_BAY is not set
|
||||
CONFIG_ACPI_PROCESSOR=y
|
||||
CONFIG_ACPI_THERMAL=y
|
||||
# CONFIG_ACPI_ASUS is not set
|
||||
|
|
@ -289,6 +295,7 @@ CONFIG_X86_POWERNOW_K8_ACPI=y
|
|||
# CONFIG_X86_CPUFREQ_NFORCE2 is not set
|
||||
# CONFIG_X86_LONGRUN is not set
|
||||
# CONFIG_X86_LONGHAUL is not set
|
||||
# CONFIG_X86_E_POWERSAVER is not set
|
||||
|
||||
#
|
||||
# shared options
|
||||
|
|
@ -368,7 +375,7 @@ CONFIG_IP_PNP_DHCP=y
|
|||
# CONFIG_INET_ESP is not set
|
||||
# CONFIG_INET_IPCOMP is not set
|
||||
# CONFIG_INET_XFRM_TUNNEL is not set
|
||||
# CONFIG_INET_TUNNEL is not set
|
||||
CONFIG_INET_TUNNEL=y
|
||||
CONFIG_INET_XFRM_MODE_TRANSPORT=y
|
||||
CONFIG_INET_XFRM_MODE_TUNNEL=y
|
||||
# CONFIG_INET_XFRM_MODE_BEET is not set
|
||||
|
|
@ -470,7 +477,13 @@ CONFIG_FW_LOADER=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
# CONFIG_PNP_DEBUG is not set
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
|
@ -490,7 +503,6 @@ CONFIG_BLK_DEV_RAM=y
|
|||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
|
||||
|
|
@ -500,6 +512,7 @@ CONFIG_BLK_DEV_INITRD=y
|
|||
# CONFIG_IBM_ASM is not set
|
||||
# CONFIG_SGI_IOC4 is not set
|
||||
# CONFIG_TIFM_CORE is not set
|
||||
# CONFIG_SONY_LAPTOP is not set
|
||||
|
||||
#
|
||||
# ATA/ATAPI/MFM/RLL support
|
||||
|
|
@ -526,6 +539,7 @@ CONFIG_BLK_DEV_IDEACPI=y
|
|||
#
|
||||
CONFIG_IDE_GENERIC=y
|
||||
# CONFIG_BLK_DEV_CMD640 is not set
|
||||
# CONFIG_BLK_DEV_IDEPNP is not set
|
||||
CONFIG_BLK_DEV_IDEPCI=y
|
||||
# CONFIG_IDEPCI_SHARE_IRQ is not set
|
||||
# CONFIG_BLK_DEV_OFFBOARD is not set
|
||||
|
|
@ -679,6 +693,7 @@ CONFIG_SATA_VIA=y
|
|||
# CONFIG_SATA_VITESSE is not set
|
||||
# CONFIG_SATA_INIC162X is not set
|
||||
CONFIG_SATA_INTEL_COMBINED=y
|
||||
CONFIG_SATA_ACPI=y
|
||||
# CONFIG_PATA_ALI is not set
|
||||
# CONFIG_PATA_AMD is not set
|
||||
# CONFIG_PATA_ARTOP is not set
|
||||
|
|
@ -786,6 +801,7 @@ CONFIG_NETDEVICES=y
|
|||
# CONFIG_BONDING is not set
|
||||
# CONFIG_EQUALIZER is not set
|
||||
# CONFIG_TUN is not set
|
||||
# CONFIG_NET_SB1000 is not set
|
||||
|
||||
#
|
||||
# ARCnet devices
|
||||
|
|
@ -979,6 +995,7 @@ CONFIG_HW_CONSOLE=y
|
|||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_PNP=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
|
|
@ -1064,6 +1081,11 @@ CONFIG_HANGCHECK_TIMER=y
|
|||
# CONFIG_HWMON is not set
|
||||
# CONFIG_HWMON_VID is not set
|
||||
|
||||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
#
|
||||
|
|
@ -1078,7 +1100,7 @@ CONFIG_HANGCHECK_TIMER=y
|
|||
#
|
||||
# Graphics support
|
||||
#
|
||||
CONFIG_FIRMWARE_EDID=y
|
||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||
# CONFIG_FB is not set
|
||||
|
||||
#
|
||||
|
|
@ -1089,7 +1111,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|||
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=128
|
||||
CONFIG_VIDEO_SELECT=y
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Sound
|
||||
|
|
@ -1238,6 +1259,7 @@ CONFIG_USB_MON=y
|
|||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_BERRY_CHARGE is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
|
|
@ -1248,6 +1270,7 @@ CONFIG_USB_MON=y
|
|||
# CONFIG_USB_SISUSBVGA is not set
|
||||
# CONFIG_USB_LD is not set
|
||||
# CONFIG_USB_TRANCEVIBRATOR is not set
|
||||
# CONFIG_USB_IOWARRIOR is not set
|
||||
# CONFIG_USB_TEST is not set
|
||||
|
||||
#
|
||||
|
|
@ -1506,6 +1529,7 @@ CONFIG_DEBUG_KERNEL=y
|
|||
CONFIG_LOG_BUF_SHIFT=18
|
||||
CONFIG_DETECT_SOFTLOCKUP=y
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_TIMER_STATS is not set
|
||||
# CONFIG_DEBUG_SLAB is not set
|
||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
||||
# CONFIG_RT_MUTEX_TESTER is not set
|
||||
|
|
@ -1525,6 +1549,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
|||
# CONFIG_FORCED_INLINING is not set
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_LKDTM is not set
|
||||
# CONFIG_FAULT_INJECTION is not set
|
||||
CONFIG_EARLY_PRINTK=y
|
||||
CONFIG_DEBUG_STACKOVERFLOW=y
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
|
|
|
|||
|
|
@ -28,3 +28,5 @@ EXPORT_SYMBOL(__read_lock_failed);
|
|||
#endif
|
||||
|
||||
EXPORT_SYMBOL(csum_partial);
|
||||
|
||||
EXPORT_SYMBOL(_proxy_pda);
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ unsigned long long sched_clock(void)
|
|||
/*
|
||||
* Fall back to jiffies if there's no TSC available:
|
||||
*/
|
||||
if (unlikely(tsc_disable))
|
||||
if (tsc_unstable || unlikely(tsc_disable))
|
||||
/* No locking but a rare wrong value is not a big deal: */
|
||||
return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/license.h>
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/bootmem.h>
|
||||
#include <linux/mm.h>
|
||||
|
|
@ -48,7 +47,6 @@ typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
|
|||
(((VROMLONGFUNC *)(rom->func)) (arg))
|
||||
|
||||
static struct vrom_header *vmi_rom;
|
||||
static int license_gplok;
|
||||
static int disable_pge;
|
||||
static int disable_pse;
|
||||
static int disable_sep;
|
||||
|
|
@ -629,13 +627,14 @@ static inline int __init check_vmi_rom(struct vrom_header *rom)
|
|||
rom->api_version_maj, rom->api_version_min,
|
||||
pci->rom_version_maj, pci->rom_version_min);
|
||||
|
||||
license_gplok = license_is_gpl_compatible(license);
|
||||
if (!license_gplok) {
|
||||
printk(KERN_WARNING "VMI: ROM license '%s' taints kernel... "
|
||||
"inlining disabled\n",
|
||||
license);
|
||||
add_taint(TAINT_PROPRIETARY_MODULE);
|
||||
}
|
||||
/* Don't allow BSD/MIT here for now because we don't want to end up
|
||||
with any binary only shim layers */
|
||||
if (strcmp(license, "GPL") && strcmp(license, "GPL v2")) {
|
||||
printk(KERN_WARNING "VMI: Non GPL license `%s' found for ROM. Not used.\n",
|
||||
license);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.20-git8
|
||||
# Tue Feb 13 11:25:16 2007
|
||||
# Linux kernel version: 2.6.21-rc3
|
||||
# Wed Mar 7 15:29:47 2007
|
||||
#
|
||||
CONFIG_X86_64=y
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86=y
|
||||
CONFIG_GENERIC_TIME=y
|
||||
CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
CONFIG_ZONE_DMA32=y
|
||||
CONFIG_LOCKDEP_SUPPORT=y
|
||||
CONFIG_STACKTRACE_SUPPORT=y
|
||||
|
|
@ -43,6 +45,7 @@ CONFIG_LOCALVERSION_AUTO=y
|
|||
CONFIG_SWAP=y
|
||||
CONFIG_SYSVIPC=y
|
||||
# CONFIG_IPC_NS is not set
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_POSIX_MQUEUE=y
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
# CONFIG_TASKSTATS is not set
|
||||
|
|
@ -53,6 +56,7 @@ CONFIG_IKCONFIG_PROC=y
|
|||
# CONFIG_CPUSETS is not set
|
||||
CONFIG_SYSFS_DEPRECATED=y
|
||||
# CONFIG_RELAY is not set
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
CONFIG_SYSCTL=y
|
||||
|
|
@ -114,11 +118,11 @@ CONFIG_X86_PC=y
|
|||
# CONFIG_X86_VSMP is not set
|
||||
# CONFIG_MK8 is not set
|
||||
# CONFIG_MPSC is not set
|
||||
CONFIG_MCORE2=y
|
||||
# CONFIG_GENERIC_CPU is not set
|
||||
CONFIG_X86_L1_CACHE_BYTES=64
|
||||
CONFIG_X86_L1_CACHE_SHIFT=6
|
||||
CONFIG_X86_INTERNODE_CACHE_BYTES=64
|
||||
# CONFIG_MCORE2 is not set
|
||||
CONFIG_GENERIC_CPU=y
|
||||
CONFIG_X86_L1_CACHE_BYTES=128
|
||||
CONFIG_X86_L1_CACHE_SHIFT=7
|
||||
CONFIG_X86_INTERNODE_CACHE_BYTES=128
|
||||
CONFIG_X86_TSC=y
|
||||
CONFIG_X86_GOOD_APIC=y
|
||||
# CONFIG_MICROCODE is not set
|
||||
|
|
@ -207,10 +211,8 @@ CONFIG_ACPI_PROCFS=y
|
|||
CONFIG_ACPI_AC=y
|
||||
CONFIG_ACPI_BATTERY=y
|
||||
CONFIG_ACPI_BUTTON=y
|
||||
# CONFIG_ACPI_HOTKEY is not set
|
||||
CONFIG_ACPI_FAN=y
|
||||
# CONFIG_ACPI_DOCK is not set
|
||||
# CONFIG_ACPI_BAY is not set
|
||||
CONFIG_ACPI_PROCESSOR=y
|
||||
CONFIG_ACPI_HOTPLUG_CPU=y
|
||||
CONFIG_ACPI_THERMAL=y
|
||||
|
|
@ -319,7 +321,7 @@ CONFIG_IP_PNP_DHCP=y
|
|||
# CONFIG_INET_ESP is not set
|
||||
# CONFIG_INET_IPCOMP is not set
|
||||
# CONFIG_INET_XFRM_TUNNEL is not set
|
||||
# CONFIG_INET_TUNNEL is not set
|
||||
CONFIG_INET_TUNNEL=y
|
||||
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
||||
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
||||
# CONFIG_INET_XFRM_MODE_BEET is not set
|
||||
|
|
@ -421,7 +423,13 @@ CONFIG_FW_LOADER=y
|
|||
#
|
||||
# Plug and Play support
|
||||
#
|
||||
# CONFIG_PNP is not set
|
||||
CONFIG_PNP=y
|
||||
# CONFIG_PNP_DEBUG is not set
|
||||
|
||||
#
|
||||
# Protocols
|
||||
#
|
||||
CONFIG_PNPACPI=y
|
||||
|
||||
#
|
||||
# Block devices
|
||||
|
|
@ -441,7 +449,6 @@ CONFIG_BLK_DEV_RAM=y
|
|||
CONFIG_BLK_DEV_RAM_COUNT=16
|
||||
CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
|
||||
CONFIG_BLK_DEV_INITRD=y
|
||||
# CONFIG_CDROM_PKTCDVD is not set
|
||||
# CONFIG_ATA_OVER_ETH is not set
|
||||
|
||||
|
|
@ -451,6 +458,7 @@ CONFIG_BLK_DEV_INITRD=y
|
|||
# CONFIG_IBM_ASM is not set
|
||||
# CONFIG_SGI_IOC4 is not set
|
||||
# CONFIG_TIFM_CORE is not set
|
||||
# CONFIG_SONY_LAPTOP is not set
|
||||
|
||||
#
|
||||
# ATA/ATAPI/MFM/RLL support
|
||||
|
|
@ -477,6 +485,7 @@ CONFIG_BLK_DEV_IDEACPI=y
|
|||
#
|
||||
CONFIG_IDE_GENERIC=y
|
||||
# CONFIG_BLK_DEV_CMD640 is not set
|
||||
# CONFIG_BLK_DEV_IDEPNP is not set
|
||||
CONFIG_BLK_DEV_IDEPCI=y
|
||||
# CONFIG_IDEPCI_SHARE_IRQ is not set
|
||||
# CONFIG_BLK_DEV_OFFBOARD is not set
|
||||
|
|
@ -623,6 +632,7 @@ CONFIG_SATA_VIA=y
|
|||
# CONFIG_SATA_VITESSE is not set
|
||||
# CONFIG_SATA_INIC162X is not set
|
||||
CONFIG_SATA_INTEL_COMBINED=y
|
||||
CONFIG_SATA_ACPI=y
|
||||
# CONFIG_PATA_ALI is not set
|
||||
# CONFIG_PATA_AMD is not set
|
||||
# CONFIG_PATA_ARTOP is not set
|
||||
|
|
@ -726,6 +736,7 @@ CONFIG_NETDEVICES=y
|
|||
# CONFIG_BONDING is not set
|
||||
# CONFIG_EQUALIZER is not set
|
||||
CONFIG_TUN=y
|
||||
# CONFIG_NET_SB1000 is not set
|
||||
|
||||
#
|
||||
# ARCnet devices
|
||||
|
|
@ -920,6 +931,7 @@ CONFIG_HW_CONSOLE=y
|
|||
CONFIG_SERIAL_8250=y
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SERIAL_8250_PNP=y
|
||||
CONFIG_SERIAL_8250_NR_UARTS=4
|
||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=4
|
||||
# CONFIG_SERIAL_8250_EXTENDED is not set
|
||||
|
|
@ -1001,6 +1013,7 @@ CONFIG_I2C_ISA=m
|
|||
# CONFIG_I2C_NFORCE2 is not set
|
||||
# CONFIG_I2C_OCORES is not set
|
||||
# CONFIG_I2C_PARPORT_LIGHT is not set
|
||||
# CONFIG_I2C_PASEMI is not set
|
||||
# CONFIG_I2C_PROSAVAGE is not set
|
||||
# CONFIG_I2C_SAVAGE4 is not set
|
||||
# CONFIG_I2C_SIS5595 is not set
|
||||
|
|
@ -1047,6 +1060,7 @@ CONFIG_HWMON=y
|
|||
# CONFIG_SENSORS_ADM1021 is not set
|
||||
# CONFIG_SENSORS_ADM1025 is not set
|
||||
# CONFIG_SENSORS_ADM1026 is not set
|
||||
# CONFIG_SENSORS_ADM1029 is not set
|
||||
# CONFIG_SENSORS_ADM1031 is not set
|
||||
# CONFIG_SENSORS_ADM9240 is not set
|
||||
# CONFIG_SENSORS_K8TEMP is not set
|
||||
|
|
@ -1089,6 +1103,11 @@ CONFIG_SENSORS_SMSC47B397=m
|
|||
# CONFIG_SENSORS_HDAPS is not set
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
|
||||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
#
|
||||
|
|
@ -1103,7 +1122,7 @@ CONFIG_SENSORS_SMSC47B397=m
|
|||
#
|
||||
# Graphics support
|
||||
#
|
||||
# CONFIG_FIRMWARE_EDID is not set
|
||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||
# CONFIG_FB is not set
|
||||
|
||||
#
|
||||
|
|
@ -1114,7 +1133,6 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
|
|||
CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=256
|
||||
CONFIG_VIDEO_SELECT=y
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||
|
||||
#
|
||||
# Sound
|
||||
|
|
@ -1130,9 +1148,8 @@ CONFIG_SOUND=y
|
|||
# Open Sound System
|
||||
#
|
||||
CONFIG_SOUND_PRIME=y
|
||||
CONFIG_OBSOLETE_OSS=y
|
||||
# CONFIG_OBSOLETE_OSS is not set
|
||||
# CONFIG_SOUND_BT878 is not set
|
||||
# CONFIG_SOUND_ES1371 is not set
|
||||
CONFIG_SOUND_ICH=y
|
||||
# CONFIG_SOUND_TRIDENT is not set
|
||||
# CONFIG_SOUND_MSNDCLAS is not set
|
||||
|
|
@ -1263,6 +1280,7 @@ CONFIG_USB_MON=y
|
|||
# CONFIG_USB_RIO500 is not set
|
||||
# CONFIG_USB_LEGOTOWER is not set
|
||||
# CONFIG_USB_LCD is not set
|
||||
# CONFIG_USB_BERRY_CHARGE is not set
|
||||
# CONFIG_USB_LED is not set
|
||||
# CONFIG_USB_CYPRESS_CY7C63 is not set
|
||||
# CONFIG_USB_CYTHERM is not set
|
||||
|
|
@ -1273,6 +1291,7 @@ CONFIG_USB_MON=y
|
|||
# CONFIG_USB_SISUSBVGA is not set
|
||||
# CONFIG_USB_LD is not set
|
||||
# CONFIG_USB_TRANCEVIBRATOR is not set
|
||||
# CONFIG_USB_IOWARRIOR is not set
|
||||
# CONFIG_USB_TEST is not set
|
||||
|
||||
#
|
||||
|
|
@ -1538,6 +1557,7 @@ CONFIG_DEBUG_KERNEL=y
|
|||
CONFIG_LOG_BUF_SHIFT=18
|
||||
CONFIG_DETECT_SOFTLOCKUP=y
|
||||
# CONFIG_SCHEDSTATS is not set
|
||||
# CONFIG_TIMER_STATS is not set
|
||||
# CONFIG_DEBUG_SLAB is not set
|
||||
# CONFIG_DEBUG_RT_MUTEXES is not set
|
||||
# CONFIG_RT_MUTEX_TESTER is not set
|
||||
|
|
@ -1556,6 +1576,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
|
|||
# CONFIG_FORCED_INLINING is not set
|
||||
# CONFIG_RCU_TORTURE_TEST is not set
|
||||
# CONFIG_LKDTM is not set
|
||||
# CONFIG_FAULT_INJECTION is not set
|
||||
# CONFIG_DEBUG_RODATA is not set
|
||||
# CONFIG_IOMMU_DEBUG is not set
|
||||
CONFIG_DEBUG_STACKOVERFLOW=y
|
||||
|
|
|
|||
|
|
@ -560,7 +560,7 @@ ia32_sys_call_table:
|
|||
.quad sys_sched_yield
|
||||
.quad sys_sched_get_priority_max
|
||||
.quad sys_sched_get_priority_min /* 160 */
|
||||
.quad sys_sched_rr_get_interval
|
||||
.quad sys32_sched_rr_get_interval
|
||||
.quad compat_sys_nanosleep
|
||||
.quad sys_mremap
|
||||
.quad sys_setresuid16
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ static int __init parse_memmap_opt(char *p)
|
|||
}
|
||||
early_param("memmap", parse_memmap_opt);
|
||||
|
||||
void finish_e820_parsing(void)
|
||||
void __init finish_e820_parsing(void)
|
||||
{
|
||||
if (userdef) {
|
||||
printk(KERN_INFO "user-defined physical RAM map:\n");
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <asm/proto.h>
|
||||
#include <asm/dma.h>
|
||||
|
||||
static void via_bugs(void)
|
||||
static void __init via_bugs(void)
|
||||
{
|
||||
#ifdef CONFIG_IOMMU
|
||||
if ((end_pfn > MAX_DMA32_PFN || force_iommu) &&
|
||||
|
|
@ -36,7 +36,7 @@ static int __init nvidia_hpet_check(struct acpi_table_header *header)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void nvidia_bugs(void)
|
||||
static void __init nvidia_bugs(void)
|
||||
{
|
||||
#ifdef CONFIG_ACPI
|
||||
/*
|
||||
|
|
@ -62,7 +62,7 @@ static void nvidia_bugs(void)
|
|||
|
||||
}
|
||||
|
||||
static void ati_bugs(void)
|
||||
static void __init ati_bugs(void)
|
||||
{
|
||||
if (timer_over_8254 == 1) {
|
||||
timer_over_8254 = 0;
|
||||
|
|
@ -88,7 +88,7 @@ struct chipset {
|
|||
void (*f)(void);
|
||||
};
|
||||
|
||||
static struct chipset early_qrk[] = {
|
||||
static struct __initdata chipset early_qrk[] = {
|
||||
{ PCI_VENDOR_ID_NVIDIA, nvidia_bugs },
|
||||
{ PCI_VENDOR_ID_VIA, via_bugs },
|
||||
{ PCI_VENDOR_ID_ATI, ati_bugs },
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@ unsigned long mp_lapic_addr = 0;
|
|||
/* Processor that is doing the boot up */
|
||||
unsigned int boot_cpu_id = -1U;
|
||||
/* Internal processor count */
|
||||
unsigned int num_processors __initdata = 0;
|
||||
unsigned int num_processors __cpuinitdata = 0;
|
||||
|
||||
unsigned disabled_cpus __initdata;
|
||||
unsigned disabled_cpus __cpuinitdata;
|
||||
|
||||
/* Bitmask of physically existing CPUs */
|
||||
physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
|
||||
|
|
|
|||
|
|
@ -675,7 +675,7 @@ void __init gart_iommu_init(void)
|
|||
dma_ops = &gart_dma_ops;
|
||||
}
|
||||
|
||||
void gart_parse_options(char *p)
|
||||
void __init gart_parse_options(char *p)
|
||||
{
|
||||
int arg;
|
||||
|
||||
|
|
|
|||
|
|
@ -59,3 +59,4 @@ EXPORT_SYMBOL(empty_zero_page);
|
|||
EXPORT_SYMBOL(init_level4_pgt);
|
||||
EXPORT_SYMBOL(load_gs_index);
|
||||
|
||||
EXPORT_SYMBOL(_proxy_pda);
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ extern int force_iommu, no_iommu;
|
|||
extern int iommu_detected;
|
||||
#ifdef CONFIG_IOMMU
|
||||
extern void gart_iommu_init(void);
|
||||
extern void gart_parse_options(char *);
|
||||
extern void __init gart_parse_options(char *);
|
||||
extern void iommu_hole_init(void);
|
||||
extern int fallback_aper_order;
|
||||
extern int fallback_aper_force;
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#include <linux/threads.h>
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/init.h>
|
||||
extern int disable_apic;
|
||||
|
||||
#include <asm/fixmap.h>
|
||||
|
|
@ -68,7 +69,7 @@ extern int __cpu_disable(void);
|
|||
extern void __cpu_die(unsigned int cpu);
|
||||
extern void prefill_possible_map(void);
|
||||
extern unsigned num_processors;
|
||||
extern unsigned disabled_cpus;
|
||||
extern unsigned __cpuinitdata disabled_cpus;
|
||||
|
||||
#define NO_PROC_ID 0xFF /* No processor magic marker */
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче