Skip to content

L
linux
Commit f0b8f932 authored by Andy Grover's avatar Andy Grover
Browse files
Options

Merge groveronline.com:/root/bk/linux-2.5 

into groveronline.com:/root/bk/linux-acpi
parents 68443ffe a375720f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 604 additions and 62 deletions
arch/i386/kernel/cpu/amd.c
View file @ f0b8f932
......@@ -188,15 +188,15 @@ static unsigned int amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)
static struct cpu_dev amd_cpu_dev __initdata = {
.c_vendor = "AMD",
.c_ident = { "AuthenticAMD" },
c_models: {
{ X86_VENDOR_AMD, 4,
.c_models = {
{ .vendor = X86_VENDOR_AMD, .family = 4, .model_names =
{
[3] "486 DX/2",
[7] "486 DX/2-WB",
[8] "486 DX/4",
[9] "486 DX/4-WB",
[14] "Am5x86-WT",
[15] "Am5x86-WB"
[3] = "486 DX/2",
[7] = "486 DX/2-WB",
[8] = "486 DX/4",
[9] = "486 DX/4-WB",
[14] = "Am5x86-WT",
[15] = "Am5x86-WB"
}
},
},
......
arch/i386/kernel/cpu/intel.c
View file @ f0b8f932
......@@ -392,52 +392,52 @@ static unsigned int intel_size_cache(struct cpuinfo_x86 * c, unsigned int size)
static struct cpu_dev intel_cpu_dev __initdata = {
.c_vendor = "Intel",
.c_ident = { "GenuineIntel" },
c_models: {
{ X86_VENDOR_INTEL, 4,
.c_models = {
{ .vendor = X86_VENDOR_INTEL, .family = 4, .model_names =
{
[0] "486 DX-25/33",
[1] "486 DX-50",
[2] "486 SX",
[3] "486 DX/2",
[4] "486 SL",
[5] "486 SX/2",
[7] "486 DX/2-WB",
[8] "486 DX/4",
[9] "486 DX/4-WB"
[0] = "486 DX-25/33",
[1] = "486 DX-50",
[2] = "486 SX",
[3] = "486 DX/2",
[4] = "486 SL",
[5] = "486 SX/2",
[7] = "486 DX/2-WB",
[8] = "486 DX/4",
[9] = "486 DX/4-WB"
}
},
{ X86_VENDOR_INTEL, 5,
{ .vendor = X86_VENDOR_INTEL, .family = 5, .model_names =
{
[0] "Pentium 60/66 A-step",
[1] "Pentium 60/66",
[2] "Pentium 75 - 200",
[3] "OverDrive PODP5V83",
[4] "Pentium MMX",
[7] "Mobile Pentium 75 - 200",
[8] "Mobile Pentium MMX"
[0] = "Pentium 60/66 A-step",
[1] = "Pentium 60/66",
[2] = "Pentium 75 - 200",
[3] = "OverDrive PODP5V83",
[4] = "Pentium MMX",
[7] = "Mobile Pentium 75 - 200",
[8] = "Mobile Pentium MMX"
}
},
{ X86_VENDOR_INTEL, 6,
{ .vendor = X86_VENDOR_INTEL, .family = 6, .model_names =
{
[0] "Pentium Pro A-step",
[1] "Pentium Pro",
[3] "Pentium II (Klamath)",
[4] "Pentium II (Deschutes)",
[5] "Pentium II (Deschutes)",
[6] "Mobile Pentium II",
[7] "Pentium III (Katmai)",
[8] "Pentium III (Coppermine)",
[10] "Pentium III (Cascades)",
[11] "Pentium III (Tualatin)",
[0] = "Pentium Pro A-step",
[1] = "Pentium Pro",
[3] = "Pentium II (Klamath)",
[4] = "Pentium II (Deschutes)",
[5] = "Pentium II (Deschutes)",
[6] = "Mobile Pentium II",
[7] = "Pentium III (Katmai)",
[8] = "Pentium III (Coppermine)",
[10] = "Pentium III (Cascades)",
[11] = "Pentium III (Tualatin)",
}
},
{ X86_VENDOR_INTEL, 15,
{ .vendor = X86_VENDOR_INTEL, .family = 15, .model_names =
{
[0] "Pentium 4 (Unknown)",
[1] "Pentium 4 (Willamette)",
[2] "Pentium 4 (Northwood)",
[4] "Pentium 4 (Foster)",
[5] "Pentium 4 (Foster)",
[0] = "Pentium 4 (Unknown)",
[1] = "Pentium 4 (Willamette)",
[2] = "Pentium 4 (Northwood)",
[4] = "Pentium 4 (Foster)",
[5] = "Pentium 4 (Foster)",
}
},
},
......
arch/i386/kernel/cpu/nexgen.c
View file @ f0b8f932
......@@ -44,8 +44,11 @@ static void nexgen_identify(struct cpuinfo_x86 * c)
static struct cpu_dev nexgen_cpu_dev __initdata = {
.c_vendor = "Nexgen",
.c_ident = { "NexGenDriven" },
c_models: {
{ X86_VENDOR_NEXGEN,5, { [1] "Nx586" } },
.c_models = {
{ .vendor = X86_VENDOR_NEXGEN,
.family = 5,
.model_names = { [1] = "Nx586" }
},
},
.c_init = init_nexgen,
.c_identify = nexgen_identify,
......
arch/i386/kernel/cpu/rise.c
View file @ f0b8f932
......@@ -31,13 +31,13 @@ static void __init init_rise(struct cpuinfo_x86 *c)
static struct cpu_dev rise_cpu_dev __initdata = {
.c_vendor = "Rise",
.c_ident = { "RiseRiseRise" },
c_models: {
{ X86_VENDOR_RISE, 5,
.c_models = {
{ .vendor = X86_VENDOR_RISE, .family = 5, .model_names =
{
[0] "iDragon",
[2] "iDragon",
[8] "iDragon II",
[9] "iDragon II"
[0] = "iDragon",
[2] = "iDragon",
[8] = "iDragon II",
[9] = "iDragon II"
}
},
},
......
arch/i386/kernel/cpu/umc.c
View file @ f0b8f932
......@@ -13,11 +13,11 @@ static void __init init_umc(struct cpuinfo_x86 * c)
static struct cpu_dev umc_cpu_dev __initdata = {
.c_vendor = "UMC",
.c_ident = { "UMC UMC UMC" },
c_models: {
{ X86_VENDOR_UMC, 4,
.c_models = {
{ .vendor = X86_VENDOR_UMC, .family = 4, .model_names =
{
[1] "U5D",
[2] "U5S",
[1] = "U5D",
[2] = "U5S",
}
},
},
......
arch/i386/kernel/timers/timer_tsc.c
View file @ f0b8f932
......@@ -224,7 +224,7 @@ time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
}
static struct notifier_block time_cpufreq_notifier_block = {
notifier_call: time_cpufreq_notifier
.notifier_call = time_cpufreq_notifier
};
#endif
......
arch/i386/pci/numa.c
View file @ f0b8f932
......@@ -84,8 +84,8 @@ static int pci_conf1_mq_write(struct pci_bus *bus, unsigned int devfn, int where
}
static struct pci_ops pci_direct_conf1_mq = {
read: pci_conf1_mq_read,
write: pci_conf1_mq_write
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
......
drivers/serial/Kconfig
View file @ f0b8f932
......@@ -317,6 +317,44 @@ config SERIAL_SUNSU
mouse on (PCI) UltraSPARC systems. Say Y or M if you want to be able
to these serial ports.
config SERIAL_MUX
tristate "Serial MUX support"
depends on PARISC
default y
---help---
Saying Y here will enable the hardware MUX serial driver for
the Nova and K class systems. The hardware MUX is not 8250/16550
compatible therefore the /dev/ttyB0 device is shared between the
Serial MUX and the PDC software console. The following steps
need to be completed to use the Serial MUX:
1. create the device entry (mknod /dev/ttyB0 c 11 0)
2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
3. Add device ttyB0 to /etc/securetty (if you want to log on as
root on this console.)
4. Change the kernel command console parameter to: console=ttyB0
config SERIAL_MUX_CONSOLE
bool "Support for console on serial MUX"
depends on SERIAL_MUX
default y
config PDC_CONSOLE
bool "PDC software console support"
depends on PARISC && !SERIAL_MUX
default n
help
Saying Y here will enable the software based PDC console to be
used as the system console. This is useful for machines in
which the hardware based console has not been written yet. The
following steps must be competed to use the PDC console:
1. create the device entry (mknod /dev/ttyB0 c 11 0)
2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
3. Add device ttyB0 to /etc/securetty (if you want to log on as
root on this console.)
4. Change the kernel command console parameter to: console=ttyB0
config SERIAL_SUNSAB
tristate "Sun Siemens SAB82532 serial support"
depends on (SPARC32 || SPARC64) && PCI
......@@ -336,12 +374,12 @@ config V850E_NB85E_UART_CONSOLE
config SERIAL_CORE
tristate
default m if SERIAL_AMBA!=y && SERIAL_CLPS711X!=y && SERIAL_21285!=y && !SERIAL_SA1100 && !SERIAL_ANAKIN && !SERIAL_UART00 && SERIAL_8250!=y && !SERIAL_ROCKETPORT && !SERIAL_SUNCORE && !V850E_NB85E_UART && (SERIAL_AMBA=m || SERIAL_CLPS711X=m || SERIAL_21285=m || SERIAL_8250=m)
default y if SERIAL_AMBA=y || SERIAL_CLPS711X=y || SERIAL_21285=y || SERIAL_SA1100 || SERIAL_ANAKIN || SERIAL_UART00 || SERIAL_8250=y || SERIAL_ROCKETPORT || SERIAL_SUNCORE || V850E_NB85E_UART
default m if SERIAL_AMBA!=y && SERIAL_CLPS711X!=y && SERIAL_21285!=y && !SERIAL_SA1100 && !SERIAL_ANAKIN && !SERIAL_UART00 && SERIAL_8250!=y && SERIAL_MUX!=y && !SERIAL_ROCKETPORT && !SERIAL_SUNCORE && !V850E_NB85E_UART && (SERIAL_AMBA=m || SERIAL_CLPS711X=m || SERIAL_21285=m || SERIAL_8250=m || SERIAL_MUX=m)
default y if SERIAL_AMBA=y || SERIAL_CLPS711X=y || SERIAL_21285=y || SERIAL_SA1100 || SERIAL_ANAKIN || SERIAL_UART00 || SERIAL_8250=y || SERIAL_MUX=y || SERIAL_ROCKETPORT || SERIAL_SUNCORE || V850E_NB85E_UART
config SERIAL_CORE_CONSOLE
bool
depends on SERIAL_AMBA_CONSOLE || SERIAL_CLPS711X_CONSOLE || SERIAL_21285_CONSOLE || SERIAL_SA1100_CONSOLE || SERIAL_ANAKIN_CONSOLE || SERIAL_UART00_CONSOLE || SERIAL_8250_CONSOLE || SERIAL_SUNCORE || V850E_NB85E_UART_CONSOLE
depends on SERIAL_AMBA_CONSOLE || SERIAL_CLPS711X_CONSOLE || SERIAL_21285_CONSOLE || SERIAL_SA1100_CONSOLE || SERIAL_ANAKIN_CONSOLE || SERIAL_UART00_CONSOLE || SERIAL_8250_CONSOLE || SERIAL_MUX_CONSOLE || SERIAL_SUNCORE || V850E_NB85E_UART_CONSOLE
default y
config SERIAL_68328
......
drivers/serial/Makefile
View file @ f0b8f932
......@@ -24,6 +24,7 @@ obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o
obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o
obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o
obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
obj-$(CONFIG_SERIAL_68360) += 68360serial.o
obj-$(CONFIG_SERIAL_COLDFIRE) += mcfserial.o
......
drivers/serial/mux.c 0 → 100644
View file @ f0b8f932
This diff is collapsed.
include/linux/major.h
View file @ f0b8f932
......@@ -33,6 +33,7 @@
#define MD_MAJOR 9
#define MISC_MAJOR 10
#define SCSI_CDROM_MAJOR 11
#define MUX_MAJOR 11 /* PA-RISC only */
#define QIC02_TAPE_MAJOR 12
#define XT_DISK_MAJOR 13
#define SOUND_MAJOR 14
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7