mirror of https://gitee.com/openkylin/linux.git
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
This commit is contained in:
Russell King
Russell King
commit
c97f68145e
2
.mailmap
2
.mailmap
|
|
@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com>
|
|||
Thomas Graf <tgraf@suug.ch>
|
||||
Tony Luck <tony.luck@intel.com>
|
||||
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
|
||||
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
|
||||
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
|
||||
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
What: /sys/class/gpio/
|
||||
Date: July 2008
|
||||
KernelVersion: 2.6.27
|
||||
Contact: David Brownell <dbrownell@users.sourceforge.net>
|
||||
Description:
|
||||
|
||||
As a Kconfig option, individual GPIO signals may be accessed from
|
||||
userspace. GPIOs are only made available to userspace by an explicit
|
||||
"export" operation. If a given GPIO is not claimed for use by
|
||||
kernel code, it may be exported by userspace (and unexported later).
|
||||
Kernel code may export it for complete or partial access.
|
||||
|
||||
GPIOs are identified as they are inside the kernel, using integers in
|
||||
the range 0..INT_MAX. See Documentation/gpio.txt for more information.
|
||||
|
||||
/sys/class/gpio
|
||||
/export ... asks the kernel to export a GPIO to userspace
|
||||
/unexport ... to return a GPIO to the kernel
|
||||
/gpioN ... for each exported GPIO #N
|
||||
/value ... always readable, writes fail for input GPIOs
|
||||
/direction ... r/w as: in, out (default low); write: high, low
|
||||
/gpiochipN ... for each gpiochip; #N is its first GPIO
|
||||
/base ... (r/o) same as N
|
||||
/label ... (r/o) descriptive, not necessarily unique
|
||||
/ngpio ... (r/o) number of GPIOs; numbered N to N + (ngpio - 1)
|
||||
|
||||
|
|
@ -635,14 +635,16 @@ prior 'mems' setting, will not be moved.
|
|||
|
||||
There is an exception to the above. If hotplug functionality is used
|
||||
to remove all the CPUs that are currently assigned to a cpuset,
|
||||
then the kernel will automatically update the cpus_allowed of all
|
||||
tasks attached to CPUs in that cpuset to allow all CPUs. When memory
|
||||
hotplug functionality for removing Memory Nodes is available, a
|
||||
similar exception is expected to apply there as well. In general,
|
||||
the kernel prefers to violate cpuset placement, over starving a task
|
||||
that has had all its allowed CPUs or Memory Nodes taken offline. User
|
||||
code should reconfigure cpusets to only refer to online CPUs and Memory
|
||||
Nodes when using hotplug to add or remove such resources.
|
||||
then all the tasks in that cpuset will be moved to the nearest ancestor
|
||||
with non-empty cpus. But the moving of some (or all) tasks might fail if
|
||||
cpuset is bound with another cgroup subsystem which has some restrictions
|
||||
on task attaching. In this failing case, those tasks will stay
|
||||
in the original cpuset, and the kernel will automatically update
|
||||
their cpus_allowed to allow all online CPUs. When memory hotplug
|
||||
functionality for removing Memory Nodes is available, a similar exception
|
||||
is expected to apply there as well. In general, the kernel prefers to
|
||||
violate cpuset placement, over starving a task that has had all
|
||||
its allowed CPUs or Memory Nodes taken offline.
|
||||
|
||||
There is a second exception to the above. GFP_ATOMIC requests are
|
||||
kernel internal allocations that must be satisfied, immediately.
|
||||
|
|
|
|||
|
|
@ -322,3 +322,11 @@ Why: Accounting can now be enabled/disabled without kernel recompilation.
|
|||
controlled by a kernel/module/sysfs/sysctl parameter.
|
||||
Who: Krzysztof Piotr Oledzki <ole@ans.pl>
|
||||
|
||||
---------------------------
|
||||
|
||||
What: ide-scsi (BLK_DEV_IDESCSI)
|
||||
When: 2.6.29
|
||||
Why: The 2.6 kernel supports direct writing to ide CD drives, which
|
||||
eliminates the need for ide-scsi. The new method is more
|
||||
efficient in every way.
|
||||
Who: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
|
||||
|
|
|
|||
|
|
@ -2413,6 +2413,8 @@ The following 4 memory types are supported:
|
|||
- (bit 1) anonymous shared memory
|
||||
- (bit 2) file-backed private memory
|
||||
- (bit 3) file-backed shared memory
|
||||
- (bit 4) ELF header pages in file-backed private memory areas (it is
|
||||
effective only if the bit 2 is cleared)
|
||||
|
||||
Note that MMIO pages such as frame buffer are never dumped and vDSO pages
|
||||
are always dumped regardless of the bitmask status.
|
||||
|
|
|
|||
|
|
@ -4377,7 +4377,7 @@ S: Maintained
|
|||
USB VIDEO CLASS
|
||||
P: Laurent Pinchart
|
||||
M: laurent.pinchart@skynet.be
|
||||
L: linx-uvc-devel@berlios.de
|
||||
L: linux-uvc-devel@lists.berlios.de
|
||||
L: video4linux-list@redhat.com
|
||||
W: http://linux-uvc.berlios.de
|
||||
S: Maintained
|
||||
|
|
|
|||
|
|
@ -524,6 +524,7 @@ config ARCH_DAVINCI
|
|||
select GENERIC_TIME
|
||||
select GENERIC_CLOCKEVENTS
|
||||
select GENERIC_GPIO
|
||||
select ARCH_REQUIRE_GPIOLIB
|
||||
select HAVE_CLK
|
||||
select ZONE_DMA
|
||||
help
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
|
|||
* The networking and block device layers use this boolean for bounce
|
||||
* buffer decisions.
|
||||
*/
|
||||
#define PCI_DMA_BUS_IS_PHYS (0)
|
||||
#define PCI_DMA_BUS_IS_PHYS (1)
|
||||
|
||||
/*
|
||||
* Whether pci_unmap_{single,page} is a nop depends upon the
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# Common objects
|
||||
obj-y := time.o irq.o clock.o serial.o io.o id.o psc.o \
|
||||
gpio.o mux.o
|
||||
gpio.o mux.o devices.o usb.o
|
||||
|
||||
# Board specific
|
||||
obj-$(CONFIG_MACH_DAVINCI_EVM) += board-evm.o
|
||||
|
|
|
|||
|
|
@ -13,6 +13,13 @@
|
|||
#include <linux/init.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/leds.h>
|
||||
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/i2c/pcf857x.h>
|
||||
#include <linux/i2c/at24.h>
|
||||
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
|
|
@ -20,13 +27,14 @@
|
|||
|
||||
#include <asm/setup.h>
|
||||
#include <asm/mach-types.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/mach/map.h>
|
||||
#include <asm/mach/flash.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/common.h>
|
||||
#include <mach/i2c.h>
|
||||
|
||||
/* other misc. init functions */
|
||||
void __init davinci_psc_init(void);
|
||||
|
|
@ -34,10 +42,10 @@ void __init davinci_irq_init(void);
|
|||
void __init davinci_map_common_io(void);
|
||||
void __init davinci_init_common_hw(void);
|
||||
|
||||
/* NOR Flash base address set to CS0 by default */
|
||||
#define NOR_FLASH_PHYS 0x02000000
|
||||
#if defined(CONFIG_MTD_PHYSMAP) || \
|
||||
defined(CONFIG_MTD_PHYSMAP_MODULE)
|
||||
|
||||
static struct mtd_partition davinci_evm_partitions[] = {
|
||||
static struct mtd_partition davinci_evm_norflash_partitions[] = {
|
||||
/* bootloader (U-Boot, etc) in first 4 sectors */
|
||||
{
|
||||
.name = "bootloader",
|
||||
|
|
@ -68,32 +76,323 @@ static struct mtd_partition davinci_evm_partitions[] = {
|
|||
}
|
||||
};
|
||||
|
||||
static struct physmap_flash_data davinci_evm_flash_data = {
|
||||
static struct physmap_flash_data davinci_evm_norflash_data = {
|
||||
.width = 2,
|
||||
.parts = davinci_evm_partitions,
|
||||
.nr_parts = ARRAY_SIZE(davinci_evm_partitions),
|
||||
.parts = davinci_evm_norflash_partitions,
|
||||
.nr_parts = ARRAY_SIZE(davinci_evm_norflash_partitions),
|
||||
};
|
||||
|
||||
/* NOTE: CFI probe will correctly detect flash part as 32M, but EMIF
|
||||
* limits addresses to 16M, so using addresses past 16M will wrap */
|
||||
static struct resource davinci_evm_flash_resource = {
|
||||
.start = NOR_FLASH_PHYS,
|
||||
.end = NOR_FLASH_PHYS + SZ_16M - 1,
|
||||
static struct resource davinci_evm_norflash_resource = {
|
||||
.start = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE,
|
||||
.end = DAVINCI_ASYNC_EMIF_DATA_CE0_BASE + SZ_16M - 1,
|
||||
.flags = IORESOURCE_MEM,
|
||||
};
|
||||
|
||||
static struct platform_device davinci_evm_flash_device = {
|
||||
static struct platform_device davinci_evm_norflash_device = {
|
||||
.name = "physmap-flash",
|
||||
.id = 0,
|
||||
.dev = {
|
||||
.platform_data = &davinci_evm_flash_data,
|
||||
.platform_data = &davinci_evm_norflash_data,
|
||||
},
|
||||
.num_resources = 1,
|
||||
.resource = &davinci_evm_flash_resource,
|
||||
.resource = &davinci_evm_norflash_resource,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
|
||||
defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
|
||||
|
||||
static struct resource ide_resources[] = {
|
||||
{
|
||||
.start = DAVINCI_CFC_ATA_BASE,
|
||||
.end = DAVINCI_CFC_ATA_BASE + 0x7ff,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
.start = IRQ_IDE,
|
||||
.end = IRQ_IDE,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static u64 ide_dma_mask = DMA_32BIT_MASK;
|
||||
|
||||
static struct platform_device ide_dev = {
|
||||
.name = "palm_bk3710",
|
||||
.id = -1,
|
||||
.resource = ide_resources,
|
||||
.num_resources = ARRAY_SIZE(ide_resources),
|
||||
.dev = {
|
||||
.dma_mask = &ide_dma_mask,
|
||||
.coherent_dma_mask = DMA_32BIT_MASK,
|
||||
},
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
/*
|
||||
* I2C GPIO expanders
|
||||
*/
|
||||
|
||||
#define PCF_Uxx_BASE(x) (DAVINCI_N_GPIO + ((x) * 8))
|
||||
|
||||
|
||||
/* U2 -- LEDs */
|
||||
|
||||
static struct gpio_led evm_leds[] = {
|
||||
{ .name = "DS8", .active_low = 1,
|
||||
.default_trigger = "heartbeat", },
|
||||
{ .name = "DS7", .active_low = 1, },
|
||||
{ .name = "DS6", .active_low = 1, },
|
||||
{ .name = "DS5", .active_low = 1, },
|
||||
{ .name = "DS4", .active_low = 1, },
|
||||
{ .name = "DS3", .active_low = 1, },
|
||||
{ .name = "DS2", .active_low = 1,
|
||||
.default_trigger = "mmc0", },
|
||||
{ .name = "DS1", .active_low = 1,
|
||||
.default_trigger = "ide-disk", },
|
||||
};
|
||||
|
||||
static const struct gpio_led_platform_data evm_led_data = {
|
||||
.num_leds = ARRAY_SIZE(evm_leds),
|
||||
.leds = evm_leds,
|
||||
};
|
||||
|
||||
static struct platform_device *evm_led_dev;
|
||||
|
||||
static int
|
||||
evm_led_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
struct gpio_led *leds = evm_leds;
|
||||
int status;
|
||||
|
||||
while (ngpio--) {
|
||||
leds->gpio = gpio++;
|
||||
leds++;
|
||||
}
|
||||
|
||||
/* what an extremely annoying way to be forced to handle
|
||||
* device unregistration ...
|
||||
*/
|
||||
evm_led_dev = platform_device_alloc("leds-gpio", 0);
|
||||
platform_device_add_data(evm_led_dev,
|
||||
&evm_led_data, sizeof evm_led_data);
|
||||
|
||||
evm_led_dev->dev.parent = &client->dev;
|
||||
status = platform_device_add(evm_led_dev);
|
||||
if (status < 0) {
|
||||
platform_device_put(evm_led_dev);
|
||||
evm_led_dev = NULL;
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
static int
|
||||
evm_led_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
if (evm_led_dev) {
|
||||
platform_device_unregister(evm_led_dev);
|
||||
evm_led_dev = NULL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct pcf857x_platform_data pcf_data_u2 = {
|
||||
.gpio_base = PCF_Uxx_BASE(0),
|
||||
.setup = evm_led_setup,
|
||||
.teardown = evm_led_teardown,
|
||||
};
|
||||
|
||||
|
||||
/* U18 - A/V clock generator and user switch */
|
||||
|
||||
static int sw_gpio;
|
||||
|
||||
static ssize_t
|
||||
sw_show(struct device *d, struct device_attribute *a, char *buf)
|
||||
{
|
||||
char *s = gpio_get_value_cansleep(sw_gpio) ? "on\n" : "off\n";
|
||||
|
||||
strcpy(buf, s);
|
||||
return strlen(s);
|
||||
}
|
||||
|
||||
static DEVICE_ATTR(user_sw, S_IRUGO, sw_show, NULL);
|
||||
|
||||
static int
|
||||
evm_u18_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
int status;
|
||||
|
||||
/* export dip switch option */
|
||||
sw_gpio = gpio + 7;
|
||||
status = gpio_request(sw_gpio, "user_sw");
|
||||
if (status == 0)
|
||||
status = gpio_direction_input(sw_gpio);
|
||||
if (status == 0)
|
||||
status = device_create_file(&client->dev, &dev_attr_user_sw);
|
||||
else
|
||||
gpio_free(sw_gpio);
|
||||
if (status != 0)
|
||||
sw_gpio = -EINVAL;
|
||||
|
||||
/* audio PLL: 48 kHz (vs 44.1 or 32), single rate (vs double) */
|
||||
gpio_request(gpio + 3, "pll_fs2");
|
||||
gpio_direction_output(gpio + 3, 0);
|
||||
|
||||
gpio_request(gpio + 2, "pll_fs1");
|
||||
gpio_direction_output(gpio + 2, 0);
|
||||
|
||||
gpio_request(gpio + 1, "pll_sr");
|
||||
gpio_direction_output(gpio + 1, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
evm_u18_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
gpio_free(gpio + 1);
|
||||
gpio_free(gpio + 2);
|
||||
gpio_free(gpio + 3);
|
||||
|
||||
if (sw_gpio > 0) {
|
||||
device_remove_file(&client->dev, &dev_attr_user_sw);
|
||||
gpio_free(sw_gpio);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct pcf857x_platform_data pcf_data_u18 = {
|
||||
.gpio_base = PCF_Uxx_BASE(1),
|
||||
.n_latch = (1 << 3) | (1 << 2) | (1 << 1),
|
||||
.setup = evm_u18_setup,
|
||||
.teardown = evm_u18_teardown,
|
||||
};
|
||||
|
||||
|
||||
/* U35 - various I/O signals used to manage USB, CF, ATA, etc */
|
||||
|
||||
static int
|
||||
evm_u35_setup(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
/* p0 = nDRV_VBUS (initial: don't supply it) */
|
||||
gpio_request(gpio + 0, "nDRV_VBUS");
|
||||
gpio_direction_output(gpio + 0, 1);
|
||||
|
||||
/* p1 = VDDIMX_EN */
|
||||
gpio_request(gpio + 1, "VDDIMX_EN");
|
||||
gpio_direction_output(gpio + 1, 1);
|
||||
|
||||
/* p2 = VLYNQ_EN */
|
||||
gpio_request(gpio + 2, "VLYNQ_EN");
|
||||
gpio_direction_output(gpio + 2, 1);
|
||||
|
||||
/* p3 = n3V3_CF_RESET (initial: stay in reset) */
|
||||
gpio_request(gpio + 3, "nCF_RESET");
|
||||
gpio_direction_output(gpio + 3, 0);
|
||||
|
||||
/* (p4 unused) */
|
||||
|
||||
/* p5 = 1V8_WLAN_RESET (initial: stay in reset) */
|
||||
gpio_request(gpio + 5, "WLAN_RESET");
|
||||
gpio_direction_output(gpio + 5, 1);
|
||||
|
||||
/* p6 = nATA_SEL (initial: select) */
|
||||
gpio_request(gpio + 6, "nATA_SEL");
|
||||
gpio_direction_output(gpio + 6, 0);
|
||||
|
||||
/* p7 = nCF_SEL (initial: deselect) */
|
||||
gpio_request(gpio + 7, "nCF_SEL");
|
||||
gpio_direction_output(gpio + 7, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
evm_u35_teardown(struct i2c_client *client, int gpio, unsigned ngpio, void *c)
|
||||
{
|
||||
gpio_free(gpio + 7);
|
||||
gpio_free(gpio + 6);
|
||||
gpio_free(gpio + 5);
|
||||
gpio_free(gpio + 3);
|
||||
gpio_free(gpio + 2);
|
||||
gpio_free(gpio + 1);
|
||||
gpio_free(gpio + 0);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct pcf857x_platform_data pcf_data_u35 = {
|
||||
.gpio_base = PCF_Uxx_BASE(2),
|
||||
.setup = evm_u35_setup,
|
||||
.teardown = evm_u35_teardown,
|
||||
};
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
/* Most of this EEPROM is unused, but U-Boot uses some data:
|
||||
* - 0x7f00, 6 bytes Ethernet Address
|
||||
* - 0x0039, 1 byte NTSC vs PAL (bit 0x80 == PAL)
|
||||
* - ... newer boards may have more
|
||||
*/
|
||||
static struct at24_platform_data eeprom_info = {
|
||||
.byte_len = (256*1024) / 8,
|
||||
.page_size = 64,
|
||||
.flags = AT24_FLAG_ADDR16,
|
||||
};
|
||||
|
||||
static struct i2c_board_info __initdata i2c_info[] = {
|
||||
{
|
||||
I2C_BOARD_INFO("pcf8574", 0x38),
|
||||
.platform_data = &pcf_data_u2,
|
||||
},
|
||||
{
|
||||
I2C_BOARD_INFO("pcf8574", 0x39),
|
||||
.platform_data = &pcf_data_u18,
|
||||
},
|
||||
{
|
||||
I2C_BOARD_INFO("pcf8574", 0x3a),
|
||||
.platform_data = &pcf_data_u35,
|
||||
},
|
||||
{
|
||||
I2C_BOARD_INFO("24c256", 0x50),
|
||||
.platform_data = &eeprom_info,
|
||||
},
|
||||
/* ALSO:
|
||||
* - tvl320aic33 audio codec (0x1b)
|
||||
* - msp430 microcontroller (0x23)
|
||||
* - tvp5146 video decoder (0x5d)
|
||||
*/
|
||||
};
|
||||
|
||||
/* The msp430 uses a slow bitbanged I2C implementation (ergo 20 KHz),
|
||||
* which requires 100 usec of idle bus after i2c writes sent to it.
|
||||
*/
|
||||
static struct davinci_i2c_platform_data i2c_pdata = {
|
||||
.bus_freq = 20 /* kHz */,
|
||||
.bus_delay = 100 /* usec */,
|
||||
};
|
||||
|
||||
static void __init evm_init_i2c(void)
|
||||
{
|
||||
davinci_init_i2c(&i2c_pdata);
|
||||
i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
|
||||
}
|
||||
|
||||
static struct platform_device *davinci_evm_devices[] __initdata = {
|
||||
&davinci_evm_flash_device,
|
||||
#if defined(CONFIG_MTD_PHYSMAP) || \
|
||||
defined(CONFIG_MTD_PHYSMAP_MODULE)
|
||||
&davinci_evm_norflash_device,
|
||||
#endif
|
||||
#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
|
||||
defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
|
||||
&ide_dev,
|
||||
#endif
|
||||
};
|
||||
|
||||
static void __init
|
||||
|
|
@ -106,13 +405,21 @@ static __init void davinci_evm_init(void)
|
|||
{
|
||||
davinci_psc_init();
|
||||
|
||||
#if defined(CONFIG_BLK_DEV_DAVINCI) || defined(CONFIG_BLK_DEV_DAVINCI_MODULE)
|
||||
#if defined(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \
|
||||
defined(CONFIG_BLK_DEV_PALMCHIP_BK3710_MODULE)
|
||||
#if defined(CONFIG_MTD_PHYSMAP) || \
|
||||
defined(CONFIG_MTD_PHYSMAP_MODULE)
|
||||
printk(KERN_WARNING "WARNING: both IDE and NOR flash are enabled, "
|
||||
"but share pins.\n\t Disable IDE for NOR support.\n");
|
||||
#endif
|
||||
#endif
|
||||
|
||||
platform_add_devices(davinci_evm_devices,
|
||||
ARRAY_SIZE(davinci_evm_devices));
|
||||
evm_init_i2c();
|
||||
|
||||
/* irlml6401 sustains over 3A, switches 5V in under 8 msec */
|
||||
setup_usb(500, 8);
|
||||
}
|
||||
|
||||
static __init void davinci_evm_irq_init(void)
|
||||
|
|
@ -124,7 +431,7 @@ static __init void davinci_evm_irq_init(void)
|
|||
MACHINE_START(DAVINCI_EVM, "DaVinci EVM")
|
||||
/* Maintainer: MontaVista Software <source@mvista.com> */
|
||||
.phys_io = IO_PHYS,
|
||||
.io_pg_offst = (io_p2v(IO_PHYS) >> 18) & 0xfffc,
|
||||
.io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc,
|
||||
.boot_params = (DAVINCI_DDR_BASE + 0x100),
|
||||
.map_io = davinci_evm_map_io,
|
||||
.init_irq = davinci_evm_irq_init,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* mach-davinci/devices.c
|
||||
*
|
||||
* DaVinci platform device setup/initialization
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/i2c.h>
|
||||
|
||||
static struct resource i2c_resources[] = {
|
||||
{
|
||||
.start = DAVINCI_I2C_BASE,
|
||||
.end = DAVINCI_I2C_BASE + 0x40,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
.start = IRQ_I2C,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device davinci_i2c_device = {
|
||||
.name = "i2c_davinci",
|
||||
.id = 1,
|
||||
.num_resources = ARRAY_SIZE(i2c_resources),
|
||||
.resource = i2c_resources,
|
||||
};
|
||||
|
||||
void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata)
|
||||
{
|
||||
davinci_i2c_device.dev.platform_data = pdata;
|
||||
(void) platform_device_register(&davinci_i2c_device);
|
||||
}
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* TI DaVinci GPIO Support
|
||||
*
|
||||
* Copyright (c) 2006 David Brownell
|
||||
* Copyright (c) 2006-2007 David Brownell
|
||||
* Copyright (c) 2007, MontaVista Software, Inc. <source@mvista.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -26,63 +26,23 @@
|
|||
|
||||
#include <asm/mach/irq.h>
|
||||
|
||||
|
||||
static DEFINE_SPINLOCK(gpio_lock);
|
||||
static DECLARE_BITMAP(gpio_in_use, DAVINCI_N_GPIO);
|
||||
|
||||
int gpio_request(unsigned gpio, const char *tag)
|
||||
{
|
||||
if (gpio >= DAVINCI_N_GPIO)
|
||||
return -EINVAL;
|
||||
struct davinci_gpio {
|
||||
struct gpio_chip chip;
|
||||
struct gpio_controller *__iomem regs;
|
||||
};
|
||||
|
||||
if (test_and_set_bit(gpio, gpio_in_use))
|
||||
return -EBUSY;
|
||||
static struct davinci_gpio chips[DIV_ROUND_UP(DAVINCI_N_GPIO, 32)];
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_request);
|
||||
|
||||
void gpio_free(unsigned gpio)
|
||||
{
|
||||
if (gpio >= DAVINCI_N_GPIO)
|
||||
return;
|
||||
|
||||
clear_bit(gpio, gpio_in_use);
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_free);
|
||||
|
||||
/* create a non-inlined version */
|
||||
static struct gpio_controller *__iomem gpio2controller(unsigned gpio)
|
||||
static struct gpio_controller *__iomem __init gpio2controller(unsigned gpio)
|
||||
{
|
||||
return __gpio_to_controller(gpio);
|
||||
}
|
||||
|
||||
/*
|
||||
* Assuming the pin is muxed as a gpio output, set its output value.
|
||||
*/
|
||||
void __gpio_set(unsigned gpio, int value)
|
||||
{
|
||||
struct gpio_controller *__iomem g = gpio2controller(gpio);
|
||||
|
||||
__raw_writel(__gpio_mask(gpio), value ? &g->set_data : &g->clr_data);
|
||||
}
|
||||
EXPORT_SYMBOL(__gpio_set);
|
||||
|
||||
|
||||
/*
|
||||
* Read the pin's value (works even if it's set up as output);
|
||||
* returns zero/nonzero.
|
||||
*
|
||||
* Note that changes are synched to the GPIO clock, so reading values back
|
||||
* right after you've set them may give old values.
|
||||
*/
|
||||
int __gpio_get(unsigned gpio)
|
||||
{
|
||||
struct gpio_controller *__iomem g = gpio2controller(gpio);
|
||||
|
||||
return !!(__gpio_mask(gpio) & __raw_readl(&g->in_data));
|
||||
}
|
||||
EXPORT_SYMBOL(__gpio_get);
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
|
|
@ -91,36 +51,45 @@ EXPORT_SYMBOL(__gpio_get);
|
|||
* needed, and enable the GPIO clock.
|
||||
*/
|
||||
|
||||
int gpio_direction_input(unsigned gpio)
|
||||
static int davinci_direction_in(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct gpio_controller *__iomem g = gpio2controller(gpio);
|
||||
struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);
|
||||
struct gpio_controller *__iomem g = d->regs;
|
||||
u32 temp;
|
||||
u32 mask;
|
||||
|
||||
if (!g)
|
||||
return -EINVAL;
|
||||
|
||||
spin_lock(&gpio_lock);
|
||||
mask = __gpio_mask(gpio);
|
||||
temp = __raw_readl(&g->dir);
|
||||
temp |= mask;
|
||||
temp |= (1 << offset);
|
||||
__raw_writel(temp, &g->dir);
|
||||
spin_unlock(&gpio_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_direction_input);
|
||||
|
||||
int gpio_direction_output(unsigned gpio, int value)
|
||||
/*
|
||||
* Read the pin's value (works even if it's set up as output);
|
||||
* returns zero/nonzero.
|
||||
*
|
||||
* Note that changes are synched to the GPIO clock, so reading values back
|
||||
* right after you've set them may give old values.
|
||||
*/
|
||||
static int davinci_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct gpio_controller *__iomem g = gpio2controller(gpio);
|
||||
u32 temp;
|
||||
u32 mask;
|
||||
struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);
|
||||
struct gpio_controller *__iomem g = d->regs;
|
||||
|
||||
if (!g)
|
||||
return -EINVAL;
|
||||
return (1 << offset) & __raw_readl(&g->in_data);
|
||||
}
|
||||
|
||||
static int
|
||||
davinci_direction_out(struct gpio_chip *chip, unsigned offset, int value)
|
||||
{
|
||||
struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);
|
||||
struct gpio_controller *__iomem g = d->regs;
|
||||
u32 temp;
|
||||
u32 mask = 1 << offset;
|
||||
|
||||
spin_lock(&gpio_lock);
|
||||
mask = __gpio_mask(gpio);
|
||||
temp = __raw_readl(&g->dir);
|
||||
temp &= ~mask;
|
||||
__raw_writel(mask, value ? &g->set_data : &g->clr_data);
|
||||
|
|
@ -128,8 +97,48 @@ int gpio_direction_output(unsigned gpio, int value)
|
|||
spin_unlock(&gpio_lock);
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(gpio_direction_output);
|
||||
|
||||
/*
|
||||
* Assuming the pin is muxed as a gpio output, set its output value.
|
||||
*/
|
||||
static void
|
||||
davinci_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
|
||||
{
|
||||
struct davinci_gpio *d = container_of(chip, struct davinci_gpio, chip);
|
||||
struct gpio_controller *__iomem g = d->regs;
|
||||
|
||||
__raw_writel((1 << offset), value ? &g->set_data : &g->clr_data);
|
||||
}
|
||||
|
||||
static int __init davinci_gpio_setup(void)
|
||||
{
|
||||
int i, base;
|
||||
|
||||
for (i = 0, base = 0;
|
||||
i < ARRAY_SIZE(chips);
|
||||
i++, base += 32) {
|
||||
chips[i].chip.label = "DaVinci";
|
||||
|
||||
chips[i].chip.direction_input = davinci_direction_in;
|
||||
chips[i].chip.get = davinci_gpio_get;
|
||||
chips[i].chip.direction_output = davinci_direction_out;
|
||||
chips[i].chip.set = davinci_gpio_set;
|
||||
|
||||
chips[i].chip.base = base;
|
||||
chips[i].chip.ngpio = DAVINCI_N_GPIO - base;
|
||||
if (chips[i].chip.ngpio > 32)
|
||||
chips[i].chip.ngpio = 32;
|
||||
|
||||
chips[i].regs = gpio2controller(base);
|
||||
|
||||
gpiochip_add(&chips[i].chip);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
pure_initcall(davinci_gpio_setup);
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
/*
|
||||
* We expect irqs will normally be set up as input pins, but they can also be
|
||||
* used as output pins ... which is convenient for testing.
|
||||
|
|
|
|||
|
|
@ -16,4 +16,7 @@ struct sys_timer;
|
|||
|
||||
extern struct sys_timer davinci_timer;
|
||||
|
||||
/* parameters describe VBUS sourcing for host mode */
|
||||
extern void setup_usb(unsigned mA, unsigned potpgt_msec);
|
||||
|
||||
#endif /* __ARCH_ARM_MACH_DAVINCI_COMMON_H */
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
#define __DAVINCI_GPIO_H
|
||||
|
||||
#include <linux/io.h>
|
||||
#include <asm-generic/gpio.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
/*
|
||||
|
|
@ -27,13 +28,16 @@
|
|||
* need to pay attention to PINMUX0 and PINMUX1 to be sure those pins are
|
||||
* used as gpios, not with other peripherals.
|
||||
*
|
||||
* GPIOs are numbered 0..(DAVINCI_N_GPIO-1). For documentation, and maybe
|
||||
* for later updates, code should write GPIO(N) or:
|
||||
* On-chip GPIOs are numbered 0..(DAVINCI_N_GPIO-1). For documentation,
|
||||
* and maybe for later updates, code should write GPIO(N) or:
|
||||
* - GPIOV18(N) for 1.8V pins, N in 0..53; same as GPIO(0)..GPIO(53)
|
||||
* - GPIOV33(N) for 3.3V pins, N in 0..17; same as GPIO(54)..GPIO(70)
|
||||
*
|
||||
* For GPIO IRQs use gpio_to_irq(GPIO(N)) or gpio_to_irq(GPIOV33(N)) etc
|
||||
* for now, that's != GPIO(N)
|
||||
*
|
||||
* GPIOs can also be on external chips, numbered after the ones built-in
|
||||
* to the DaVinci chip. For now, they won't be usable as IRQ sources.
|
||||
*/
|
||||
#define GPIO(X) (X) /* 0 <= X <= 70 */
|
||||
#define GPIOV18(X) (X) /* 1.8V i/o; 0 <= X <= 53 */
|
||||
|
|
@ -67,11 +71,11 @@ __gpio_to_controller(unsigned gpio)
|
|||
void *__iomem ptr;
|
||||
|
||||
if (gpio < 32)
|
||||
ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x10);
|
||||
ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x10);
|
||||
else if (gpio < 64)
|
||||
ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x38);
|
||||
ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x38);
|
||||
else if (gpio < DAVINCI_N_GPIO)
|
||||
ptr = (void *__iomem)IO_ADDRESS(DAVINCI_GPIO_BASE + 0x60);
|
||||
ptr = IO_ADDRESS(DAVINCI_GPIO_BASE + 0x60);
|
||||
else
|
||||
ptr = NULL;
|
||||
return ptr;
|
||||
|
|
@ -83,25 +87,17 @@ static inline u32 __gpio_mask(unsigned gpio)
|
|||
}
|
||||
|
||||
/* The get/set/clear functions will inline when called with constant
|
||||
* parameters, for low-overhead bitbanging. Illegal constant parameters
|
||||
* cause link-time errors.
|
||||
* parameters referencing built-in GPIOs, for low-overhead bitbanging.
|
||||
*
|
||||
* Otherwise, calls with variable parameters use outlined functions.
|
||||
* Otherwise, calls with variable parameters or referencing external
|
||||
* GPIOs (e.g. on GPIO expander chips) use outlined functions.
|
||||
*/
|
||||
extern int __error_inval_gpio(void);
|
||||
|
||||
extern void __gpio_set(unsigned gpio, int value);
|
||||
extern int __gpio_get(unsigned gpio);
|
||||
|
||||
static inline void gpio_set_value(unsigned gpio, int value)
|
||||
{
|
||||
if (__builtin_constant_p(value)) {
|
||||
if (__builtin_constant_p(value) && gpio < DAVINCI_N_GPIO) {
|
||||
struct gpio_controller *__iomem g;
|
||||
u32 mask;
|
||||
|
||||
if (gpio >= DAVINCI_N_GPIO)
|
||||
__error_inval_gpio();
|
||||
|
||||
g = __gpio_to_controller(gpio);
|
||||
mask = __gpio_mask(gpio);
|
||||
if (value)
|
||||
|
|
@ -111,48 +107,47 @@ static inline void gpio_set_value(unsigned gpio, int value)
|
|||
return;
|
||||
}
|
||||
|
||||
__gpio_set(gpio, value);
|
||||
__gpio_set_value(gpio, value);
|
||||
}
|
||||
|
||||
/* Returns zero or nonzero; works for gpios configured as inputs OR
|
||||
* as outputs.
|
||||
* as outputs, at least for built-in GPIOs.
|
||||
*
|
||||
* NOTE: changes in reported values are synchronized to the GPIO clock.
|
||||
* This is most easily seen after calling gpio_set_value() and then immediatly
|
||||
* gpio_get_value(), where the gpio_get_value() would return the old value
|
||||
* until the GPIO clock ticks and the new value gets latched.
|
||||
* NOTE: for built-in GPIOs, changes in reported values are synchronized
|
||||
* to the GPIO clock. This is easily seen after calling gpio_set_value()
|
||||
* and then immediately gpio_get_value(), where the gpio_get_value() will
|
||||
* return the old value until the GPIO clock ticks and the new value gets
|
||||
* latched.
|
||||
*/
|
||||
|
||||
static inline int gpio_get_value(unsigned gpio)
|
||||
{
|
||||
struct gpio_controller *__iomem g;
|
||||
struct gpio_controller *__iomem g;
|
||||
|
||||
if (!__builtin_constant_p(gpio))
|
||||
return __gpio_get(gpio);
|
||||
|
||||
if (gpio >= DAVINCI_N_GPIO)
|
||||
return __error_inval_gpio();
|
||||
if (!__builtin_constant_p(gpio) || gpio >= DAVINCI_N_GPIO)
|
||||
return __gpio_get_value(gpio);
|
||||
|
||||
g = __gpio_to_controller(gpio);
|
||||
return !!(__gpio_mask(gpio) & __raw_readl(&g->in_data));
|
||||
return __gpio_mask(gpio) & __raw_readl(&g->in_data);
|
||||
}
|
||||
|
||||
/* powerup default direction is IN */
|
||||
extern int gpio_direction_input(unsigned gpio);
|
||||
extern int gpio_direction_output(unsigned gpio, int value);
|
||||
|
||||
#include <asm-generic/gpio.h> /* cansleep wrappers */
|
||||
|
||||
extern int gpio_request(unsigned gpio, const char *tag);
|
||||
extern void gpio_free(unsigned gpio);
|
||||
static inline int gpio_cansleep(unsigned gpio)
|
||||
{
|
||||
if (__builtin_constant_p(gpio) && gpio < DAVINCI_N_GPIO)
|
||||
return 0;
|
||||
else
|
||||
return __gpio_cansleep(gpio);
|
||||
}
|
||||
|
||||
static inline int gpio_to_irq(unsigned gpio)
|
||||
{
|
||||
if (gpio >= DAVINCI_N_GPIO)
|
||||
return -EINVAL;
|
||||
return DAVINCI_N_AINTC_IRQ + gpio;
|
||||
}
|
||||
|
||||
static inline int irq_to_gpio(unsigned irq)
|
||||
{
|
||||
/* caller guarantees gpio_to_irq() succeeded */
|
||||
return irq - DAVINCI_N_AINTC_IRQ;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,8 +14,11 @@
|
|||
|
||||
/* All frequencies are expressed in kHz */
|
||||
struct davinci_i2c_platform_data {
|
||||
unsigned int bus_freq; /* standard bus frequency */
|
||||
unsigned int bus_delay; /* transaction delay */
|
||||
unsigned int bus_freq; /* standard bus frequency (kHz) */
|
||||
unsigned int bus_delay; /* post-transaction delay (usec) */
|
||||
};
|
||||
|
||||
/* for board setup code */
|
||||
void davinci_init_i2c(struct davinci_i2c_platform_data *);
|
||||
|
||||
#endif /* __ASM_ARCH_I2C_H */
|
||||
|
|
|
|||
|
|
@ -22,9 +22,8 @@
|
|||
#define IO_OFFSET 0xfd000000 /* Virtual IO = 0xfec00000 */
|
||||
#define IO_SIZE 0x00400000
|
||||
#define IO_VIRT (IO_PHYS + IO_OFFSET)
|
||||
#define io_p2v(pa) ((pa) + IO_OFFSET)
|
||||
#define io_v2p(va) ((va) - IO_OFFSET)
|
||||
#define IO_ADDRESS(x) io_p2v(x)
|
||||
#define __IO_ADDRESS(x) ((x) + IO_OFFSET)
|
||||
|
||||
/*
|
||||
* We don't actually have real ISA nor PCI buses, but there is so many
|
||||
|
|
@ -35,7 +34,12 @@
|
|||
#define __mem_pci(a) (a)
|
||||
#define __mem_isa(a) (a)
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
#define IO_ADDRESS(pa) IOMEM(__IO_ADDRESS(pa))
|
||||
|
||||
#ifdef __ASSEMBLER__
|
||||
#define IOMEM(x) x
|
||||
#else
|
||||
#define IOMEM(x) ((void __force __iomem *)(x))
|
||||
|
||||
/*
|
||||
* Functions to access the DaVinci IO region
|
||||
|
|
@ -46,34 +50,13 @@
|
|||
* - DO NOT use hardcoded virtual addresses to allow changing the
|
||||
* IO address space again if needed
|
||||
*/
|
||||
#define davinci_readb(a) (*(volatile unsigned char *)IO_ADDRESS(a))
|
||||
#define davinci_readw(a) (*(volatile unsigned short *)IO_ADDRESS(a))
|
||||
#define davinci_readl(a) (*(volatile unsigned int *)IO_ADDRESS(a))
|
||||
#define davinci_readb(a) __raw_readb(IO_ADDRESS(a))
|
||||
#define davinci_readw(a) __raw_readw(IO_ADDRESS(a))
|
||||
#define davinci_readl(a) __raw_readl(IO_ADDRESS(a))
|
||||
|
||||
#define davinci_writeb(v,a) (*(volatile unsigned char *)IO_ADDRESS(a) = (v))
|
||||
#define davinci_writew(v,a) (*(volatile unsigned short *)IO_ADDRESS(a) = (v))
|
||||
#define davinci_writel(v,a) (*(volatile unsigned int *)IO_ADDRESS(a) = (v))
|
||||
|
||||
/* 16 bit uses LDRH/STRH, base +/- offset_8 */
|
||||
typedef struct { volatile u16 offset[256]; } __regbase16;
|
||||
#define __REGV16(vaddr) ((__regbase16 *)((vaddr)&~0xff)) \
|
||||
->offset[((vaddr)&0xff)>>1]
|
||||
#define __REG16(paddr) __REGV16(io_p2v(paddr))
|
||||
|
||||
/* 8/32 bit uses LDR/STR, base +/- offset_12 */
|
||||
typedef struct { volatile u8 offset[4096]; } __regbase8;
|
||||
#define __REGV8(vaddr) ((__regbase8 *)((vaddr)&~4095)) \
|
||||
->offset[((vaddr)&4095)>>0]
|
||||
#define __REG8(paddr) __REGV8(io_p2v(paddr))
|
||||
|
||||
typedef struct { volatile u32 offset[4096]; } __regbase32;
|
||||
#define __REGV32(vaddr) ((__regbase32 *)((vaddr)&~4095)) \
|
||||
->offset[((vaddr)&4095)>>2]
|
||||
|
||||
#define __REG(paddr) __REGV32(io_p2v(paddr))
|
||||
#else
|
||||
|
||||
#define __REG(x) (*((volatile unsigned long *)io_p2v(x)))
|
||||
#define davinci_writeb(v, a) __raw_writeb(v, IO_ADDRESS(a))
|
||||
#define davinci_writew(v, a) __raw_writew(v, IO_ADDRESS(a))
|
||||
#define davinci_writel(v, a) __raw_writel(v, IO_ADDRESS(a))
|
||||
|
||||
#endif /* __ASSEMBLER__ */
|
||||
#endif /* __ASM_ARCH_IO_H */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
/*
|
||||
* USB
|
||||
*/
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
|
||||
#include <linux/usb/musb.h>
|
||||
#include <linux/usb/otg.h>
|
||||
|
||||
#include <mach/common.h>
|
||||
#include <mach/hardware.h>
|
||||
|
||||
#if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
|
||||
static struct musb_hdrc_eps_bits musb_eps[] = {
|
||||
{ "ep1_tx", 8, },
|
||||
{ "ep1_rx", 8, },
|
||||
{ "ep2_tx", 8, },
|
||||
{ "ep2_rx", 8, },
|
||||
{ "ep3_tx", 5, },
|
||||
{ "ep3_rx", 5, },
|
||||
{ "ep4_tx", 5, },
|
||||
{ "ep4_rx", 5, },
|
||||
};
|
||||
|
||||
static struct musb_hdrc_config musb_config = {
|
||||
.multipoint = true,
|
||||
.dyn_fifo = true,
|
||||
.soft_con = true,
|
||||
.dma = true,
|
||||
|
||||
.num_eps = 5,
|
||||
.dma_channels = 8,
|
||||
.ram_bits = 10,
|
||||
.eps_bits = musb_eps,
|
||||
};
|
||||
|
||||
static struct musb_hdrc_platform_data usb_data = {
|
||||
#if defined(CONFIG_USB_MUSB_OTG)
|
||||
/* OTG requires a Mini-AB connector */
|
||||
.mode = MUSB_OTG,
|
||||
#elif defined(CONFIG_USB_MUSB_PERIPHERAL)
|
||||
.mode = MUSB_PERIPHERAL,
|
||||
#elif defined(CONFIG_USB_MUSB_HOST)
|
||||
.mode = MUSB_HOST,
|
||||
#endif
|
||||
.config = &musb_config,
|
||||
};
|
||||
|
||||
static struct resource usb_resources[] = {
|
||||
{
|
||||
/* physical address */
|
||||
.start = DAVINCI_USB_OTG_BASE,
|
||||
.end = DAVINCI_USB_OTG_BASE + 0x5ff,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
.start = IRQ_USBINT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
||||
static u64 usb_dmamask = DMA_32BIT_MASK;
|
||||
|
||||
static struct platform_device usb_dev = {
|
||||
.name = "musb_hdrc",
|
||||
.id = -1,
|
||||
.dev = {
|
||||
.platform_data = &usb_data,
|
||||
.dma_mask = &usb_dmamask,
|
||||
.coherent_dma_mask = DMA_32BIT_MASK,
|
||||
},
|
||||
.resource = usb_resources,
|
||||
.num_resources = ARRAY_SIZE(usb_resources),
|
||||
};
|
||||
|
||||
#ifdef CONFIG_USB_MUSB_OTG
|
||||
|
||||
static struct otg_transceiver *xceiv;
|
||||
|
||||
struct otg_transceiver *otg_get_transceiver(void)
|
||||
{
|
||||
if (xceiv)
|
||||
get_device(xceiv->dev);
|
||||
return xceiv;
|
||||
}
|
||||
EXPORT_SYMBOL(otg_get_transceiver);
|
||||
|
||||
int otg_set_transceiver(struct otg_transceiver *x)
|
||||
{
|
||||
if (xceiv && x)
|
||||
return -EBUSY;
|
||||
xceiv = x;
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(otg_set_transceiver);
|
||||
|
||||
#endif
|
||||
|
||||
void __init setup_usb(unsigned mA, unsigned potpgt_msec)
|
||||
{
|
||||
usb_data.power = mA / 2;
|
||||
usb_data.potpgt = potpgt_msec / 2;
|
||||
platform_device_register(&usb_dev);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void __init setup_usb(unsigned mA, unsigned potpgt_msec)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_USB_MUSB_HDRC */
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ static struct platform_device pcm037_flash = {
|
|||
};
|
||||
|
||||
static struct imxuart_platform_data uart_pdata = {
|
||||
.flags = 0,
|
||||
.flags = IMXUART_HAVE_RTSCTS,
|
||||
};
|
||||
|
||||
static struct platform_device *devices[] __initdata = {
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@
|
|||
#include <asm/mach/sharpsl_param.h>
|
||||
|
||||
#include "generic.h"
|
||||
#include "clock.h"
|
||||
#include "devices.h"
|
||||
|
||||
static unsigned long tosa_pin_config[] = {
|
||||
|
|
@ -521,6 +522,14 @@ static struct gpio_keys_button tosa_gpio_keys[] = {
|
|||
.wakeup = 1,
|
||||
.active_low = 1,
|
||||
},
|
||||
{
|
||||
.type = EV_SW,
|
||||
.code = SW_HEADPHONE_INSERT,
|
||||
.gpio = TOSA_GPIO_EAR_IN,
|
||||
.desc = "HeadPhone insert",
|
||||
.active_low = 1,
|
||||
.debounce_interval = 300,
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpio_keys_platform_data tosa_gpio_keys_platform_data = {
|
||||
|
|
@ -792,6 +801,8 @@ static void __init tosa_init(void)
|
|||
pxa_set_i2c_info(NULL);
|
||||
platform_scoop_config = &tosa_pcmcia_config;
|
||||
|
||||
clk_add_alias("CLK_CK3P6MI", &tc6393xb_device.dev, "GPIO11_CLK", NULL);
|
||||
|
||||
platform_add_devices(devices, ARRAY_SIZE(devices));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include <mach/tc.h>
|
||||
#include <mach/board.h>
|
||||
#include <mach/mmc.h>
|
||||
#include <mach/mux.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/menelaus.h>
|
||||
|
|
@ -194,25 +195,38 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
|
|||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
|
||||
#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \
|
||||
defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP24XX
|
||||
#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
|
||||
#define OMAP_MMC1_BASE 0x4809c000
|
||||
#define OMAP_MMC1_INT INT_24XX_MMC_IRQ
|
||||
#else
|
||||
#define OMAP_MMC1_BASE 0xfffb7800
|
||||
#define OMAP_MMC1_INT INT_MMC
|
||||
#endif
|
||||
#define OMAP_MMC2_BASE 0xfffb7c00 /* omap16xx only */
|
||||
#define OMAP_MMC1_END (OMAP_MMC1_BASE + 0x1fc)
|
||||
#define OMAP_MMC1_INT INT_24XX_MMC_IRQ
|
||||
|
||||
static struct omap_mmc_conf mmc1_conf;
|
||||
#define OMAP_MMC2_BASE 0x480b4000
|
||||
#define OMAP_MMC2_END (OMAP_MMC2_BASE + 0x1fc)
|
||||
#define OMAP_MMC2_INT INT_24XX_MMC2_IRQ
|
||||
|
||||
#else
|
||||
|
||||
#define OMAP_MMC1_BASE 0xfffb7800
|
||||
#define OMAP_MMC1_END (OMAP_MMC1_BASE + 0x7f)
|
||||
#define OMAP_MMC1_INT INT_MMC
|
||||
|
||||
#define OMAP_MMC2_BASE 0xfffb7c00 /* omap16xx only */
|
||||
#define OMAP_MMC2_END (OMAP_MMC2_BASE + 0x7f)
|
||||
#define OMAP_MMC2_INT INT_1610_MMC2
|
||||
|
||||
#endif
|
||||
|
||||
static struct omap_mmc_platform_data mmc1_data;
|
||||
|
||||
static u64 mmc1_dmamask = 0xffffffff;
|
||||
|
||||
static struct resource mmc1_resources[] = {
|
||||
{
|
||||
.start = OMAP_MMC1_BASE,
|
||||
.end = OMAP_MMC1_BASE + 0x7f,
|
||||
.end = OMAP_MMC1_END,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
|
|
@ -226,26 +240,27 @@ static struct platform_device mmc_omap_device1 = {
|
|||
.id = 1,
|
||||
.dev = {
|
||||
.dma_mask = &mmc1_dmamask,
|
||||
.platform_data = &mmc1_conf,
|
||||
.platform_data = &mmc1_data,
|
||||
},
|
||||
.num_resources = ARRAY_SIZE(mmc1_resources),
|
||||
.resource = mmc1_resources,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP16XX
|
||||
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
|
||||
defined(CONFIG_ARCH_OMAP34XX)
|
||||
|
||||
static struct omap_mmc_conf mmc2_conf;
|
||||
static struct omap_mmc_platform_data mmc2_data;
|
||||
|
||||
static u64 mmc2_dmamask = 0xffffffff;
|
||||
|
||||
static struct resource mmc2_resources[] = {
|
||||
{
|
||||
.start = OMAP_MMC2_BASE,
|
||||
.end = OMAP_MMC2_BASE + 0x7f,
|
||||
.end = OMAP_MMC2_END,
|
||||
.flags = IORESOURCE_MEM,
|
||||
},
|
||||
{
|
||||
.start = INT_1610_MMC2,
|
||||
.start = OMAP_MMC2_INT,
|
||||
.flags = IORESOURCE_IRQ,
|
||||
},
|
||||
};
|
||||
|
|
@ -255,26 +270,19 @@ static struct platform_device mmc_omap_device2 = {
|
|||
.id = 2,
|
||||
.dev = {
|
||||
.dma_mask = &mmc2_dmamask,
|
||||
.platform_data = &mmc2_conf,
|
||||
.platform_data = &mmc2_data,
|
||||
},
|
||||
.num_resources = ARRAY_SIZE(mmc2_resources),
|
||||
.resource = mmc2_resources,
|
||||
};
|
||||
#endif
|
||||
|
||||
static void __init omap_init_mmc(void)
|
||||
static inline void omap_init_mmc_conf(const struct omap_mmc_config *mmc_conf)
|
||||
{
|
||||
const struct omap_mmc_config *mmc_conf;
|
||||
const struct omap_mmc_conf *mmc;
|
||||
|
||||
/* NOTE: assumes MMC was never (wrongly) enabled */
|
||||
mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
|
||||
if (!mmc_conf)
|
||||
if (cpu_is_omap2430() || cpu_is_omap34xx())
|
||||
return;
|
||||
|
||||
/* block 1 is always available and has just one pinout option */
|
||||
mmc = &mmc_conf->mmc[0];
|
||||
if (mmc->enabled) {
|
||||
if (mmc_conf->mmc[0].enabled) {
|
||||
if (cpu_is_omap24xx()) {
|
||||
omap_cfg_reg(H18_24XX_MMC_CMD);
|
||||
omap_cfg_reg(H15_24XX_MMC_CLKI);
|
||||
|
|
@ -292,7 +300,7 @@ static void __init omap_init_mmc(void)
|
|||
omap_cfg_reg(P20_1710_MMC_DATDIR0);
|
||||
}
|
||||
}
|
||||
if (mmc->wire4) {
|
||||
if (mmc_conf->mmc[0].wire4) {
|
||||
if (cpu_is_omap24xx()) {
|
||||
omap_cfg_reg(H14_24XX_MMC_DAT1);
|
||||
omap_cfg_reg(E19_24XX_MMC_DAT2);
|
||||
|
|
@ -303,25 +311,35 @@ static void __init omap_init_mmc(void)
|
|||
} else {
|
||||
omap_cfg_reg(MMC_DAT1);
|
||||
/* NOTE: DAT2 can be on W10 (here) or M15 */
|
||||
if (!mmc->nomux)
|
||||
if (!mmc_conf->mmc[0].nomux)
|
||||
omap_cfg_reg(MMC_DAT2);
|
||||
omap_cfg_reg(MMC_DAT3);
|
||||
}
|
||||
}
|
||||
mmc1_conf = *mmc;
|
||||
(void) platform_device_register(&mmc_omap_device1);
|
||||
#if defined(CONFIG_ARCH_OMAP2420)
|
||||
if (mmc_conf->mmc[0].internal_clock) {
|
||||
/*
|
||||
* Use internal loop-back in MMC/SDIO
|
||||
* Module Input Clock selection
|
||||
*/
|
||||
if (cpu_is_omap24xx()) {
|
||||
u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
|
||||
v |= (1 << 24); /* not used in 243x */
|
||||
omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ARCH_OMAP16XX
|
||||
/* block 2 is on newer chips, and has many pinout options */
|
||||
mmc = &mmc_conf->mmc[1];
|
||||
if (mmc->enabled) {
|
||||
if (!mmc->nomux) {
|
||||
if (mmc_conf->mmc[1].enabled) {
|
||||
if (!mmc_conf->mmc[1].nomux) {
|
||||
omap_cfg_reg(Y8_1610_MMC2_CMD);
|
||||
omap_cfg_reg(Y10_1610_MMC2_CLK);
|
||||
omap_cfg_reg(R18_1610_MMC2_CLKIN);
|
||||
omap_cfg_reg(W8_1610_MMC2_DAT0);
|
||||
if (mmc->wire4) {
|
||||
if (mmc_conf->mmc[1].wire4) {
|
||||
omap_cfg_reg(V8_1610_MMC2_DAT1);
|
||||
omap_cfg_reg(W15_1610_MMC2_DAT2);
|
||||
omap_cfg_reg(R10_1610_MMC2_DAT3);
|
||||
|
|
@ -337,14 +355,55 @@ static void __init omap_init_mmc(void)
|
|||
if (cpu_is_omap1710())
|
||||
omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24),
|
||||
MOD_CONF_CTRL_1);
|
||||
mmc2_conf = *mmc;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
static void __init omap_init_mmc(void)
|
||||
{
|
||||
const struct omap_mmc_config *mmc_conf;
|
||||
|
||||
/* NOTE: assumes MMC was never (wrongly) enabled */
|
||||
mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
|
||||
if (!mmc_conf)
|
||||
return;
|
||||
|
||||
omap_init_mmc_conf(mmc_conf);
|
||||
|
||||
if (mmc_conf->mmc[0].enabled) {
|
||||
mmc1_data.conf = mmc_conf->mmc[0];
|
||||
(void) platform_device_register(&mmc_omap_device1);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
|
||||
defined(CONFIG_ARCH_OMAP34XX)
|
||||
if (mmc_conf->mmc[1].enabled) {
|
||||
mmc2_data.conf = mmc_conf->mmc[1];
|
||||
(void) platform_device_register(&mmc_omap_device2);
|
||||
}
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info)
|
||||
{
|
||||
switch (host) {
|
||||
case 1:
|
||||
mmc1_data = *info;
|
||||
break;
|
||||
#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP2430) || \
|
||||
defined(CONFIG_ARCH_OMAP34XX)
|
||||
case 2:
|
||||
mmc2_data = *info;
|
||||
break;
|
||||
#endif
|
||||
default:
|
||||
BUG();
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
static inline void omap_init_mmc(void) {}
|
||||
void omap_set_mmc_info(int host, const struct omap_mmc_platform_data *info) {}
|
||||
#endif
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
|
|
|||
|
|
@ -266,4 +266,19 @@ do { \
|
|||
} \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
* format for entries in the Global Offset Table
|
||||
*/
|
||||
struct got_entry {
|
||||
uint64_t val;
|
||||
};
|
||||
|
||||
/*
|
||||
* Layout of the Function Descriptor
|
||||
*/
|
||||
struct fdesc {
|
||||
uint64_t ip;
|
||||
uint64_t gp;
|
||||
};
|
||||
|
||||
#endif /* _ASM_IA64_ELF_H */
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
* David Mosberger-Tang <davidm@hpl.hp.com>
|
||||
*/
|
||||
|
||||
#include <linux/elf.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <asm-generic/sections.h>
|
||||
|
||||
extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[];
|
||||
|
|
@ -22,7 +24,16 @@ extern char __start_unwind[], __end_unwind[];
|
|||
extern char __start_ivt_text[], __end_ivt_text[];
|
||||
|
||||
#undef dereference_function_descriptor
|
||||
void *dereference_function_descriptor(void *);
|
||||
static inline void *dereference_function_descriptor(void *ptr)
|
||||
{
|
||||
struct fdesc *desc = ptr;
|
||||
void *p;
|
||||
|
||||
if (!probe_kernel_address(&desc->ip, p))
|
||||
ptr = p;
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
||||
#endif /* _ASM_IA64_SECTIONS_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -223,10 +223,11 @@ extern void bte_error_handler(unsigned long);
|
|||
* until the transfer is complete. In order to get the asynch
|
||||
* version of bte_copy, you must perform this check yourself.
|
||||
*/
|
||||
#define BTE_UNALIGNED_COPY(src, dest, len, mode) \
|
||||
(((len & L1_CACHE_MASK) || (src & L1_CACHE_MASK) || \
|
||||
(dest & L1_CACHE_MASK)) ? \
|
||||
bte_unaligned_copy(src, dest, len, mode) : \
|
||||
#define BTE_UNALIGNED_COPY(src, dest, len, mode) \
|
||||
(((len & (L1_CACHE_BYTES - 1)) || \
|
||||
(src & (L1_CACHE_BYTES - 1)) || \
|
||||
(dest & (L1_CACHE_BYTES - 1))) ? \
|
||||
bte_unaligned_copy(src, dest, len, mode) : \
|
||||
bte_copy(src, dest, len, mode, NULL))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -31,11 +31,9 @@
|
|||
#include <linux/elf.h>
|
||||
#include <linux/moduleloader.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/vmalloc.h>
|
||||
|
||||
#include <asm/patch.h>
|
||||
#include <asm/sections.h>
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
#define ARCH_MODULE_DEBUG 0
|
||||
|
|
@ -137,15 +135,6 @@ static const char *reloc_name[256] = {
|
|||
|
||||
#undef N
|
||||
|
||||
struct got_entry {
|
||||
uint64_t val;
|
||||
};
|
||||
|
||||
struct fdesc {
|
||||
uint64_t ip;
|
||||
uint64_t gp;
|
||||
};
|
||||
|
||||
/* Opaque struct for insns, to protect against derefs. */
|
||||
struct insn;
|
||||
|
||||
|
|
@ -943,13 +932,3 @@ module_arch_cleanup (struct module *mod)
|
|||
if (mod->arch.core_unw_table)
|
||||
unw_remove_unwind_table(mod->arch.core_unw_table);
|
||||
}
|
||||
|
||||
void *dereference_function_descriptor(void *ptr)
|
||||
{
|
||||
struct fdesc *desc = ptr;
|
||||
void *p;
|
||||
|
||||
if (!probe_kernel_address(&desc->ip, p))
|
||||
ptr = p;
|
||||
return ptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -741,16 +741,14 @@ int __cpu_disable(void)
|
|||
return -EBUSY;
|
||||
}
|
||||
|
||||
cpu_clear(cpu, cpu_online_map);
|
||||
|
||||
if (migrate_platform_irqs(cpu)) {
|
||||
cpu_set(cpu, cpu_online_map);
|
||||
return (-EBUSY);
|
||||
}
|
||||
|
||||
remove_siblinginfo(cpu);
|
||||
cpu_clear(cpu, cpu_online_map);
|
||||
fixup_irqs();
|
||||
cpu_clear(cpu, cpu_online_map);
|
||||
local_flush_tlb_all();
|
||||
cpu_clear(cpu, cpu_callin_map);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -420,8 +420,10 @@ tioca_dma_mapped(struct pci_dev *pdev, u64 paddr, size_t req_size)
|
|||
entry = find_next_zero_bit(map, mapsize, last_entry);
|
||||
}
|
||||
|
||||
if (entry > mapsize)
|
||||
if (entry > mapsize) {
|
||||
kfree(ca_dmamap);
|
||||
goto map_return;
|
||||
}
|
||||
|
||||
for (i = 0; i < entries; i++)
|
||||
set_bit(entry + i, map);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:00 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -166,10 +172,6 @@ CONFIG_GENERIC_ISA_DMA=y
|
|||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ZORRO_NAMES=y
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -183,6 +185,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -460,6 +466,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -470,6 +477,7 @@ CONFIG_BLK_DEV_IDE=y
|
|||
#
|
||||
# Please see Documentation/ide/ide.txt for help/info on IDE drives
|
||||
#
|
||||
CONFIG_IDE_ATAPI=y
|
||||
# CONFIG_BLK_DEV_IDE_SATA is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=y
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
|
|
@ -489,8 +497,6 @@ CONFIG_BLK_DEV_GAYLE=y
|
|||
CONFIG_BLK_DEV_IDEDOUBLER=y
|
||||
CONFIG_BLK_DEV_BUDDHA=y
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_HD_ONLY is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
|
|
@ -556,6 +562,7 @@ CONFIG_A2091_SCSI=y
|
|||
CONFIG_GVP11_SCSI=y
|
||||
CONFIG_SCSI_A4000T=y
|
||||
CONFIG_SCSI_ZORRO7XX=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -564,7 +571,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -573,13 +580,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -722,6 +725,7 @@ CONFIG_INPUT_M68K_BEEP=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -757,6 +761,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -768,8 +773,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -844,10 +851,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_DMASOUND_PAULA=m
|
||||
CONFIG_DMASOUND=m
|
||||
|
|
@ -861,6 +864,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_AUXDISPLAY is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
|
|
@ -899,6 +903,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -958,6 +963,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -980,7 +986,6 @@ CONFIG_EXPORTFS=m
|
|||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_GSS=m
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -989,7 +994,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -1054,6 +1058,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1113,6 +1119,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=m
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1154,6 +1164,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:01 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -161,10 +167,6 @@ CONFIG_HEARTBEAT=y
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -178,6 +180,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -411,6 +414,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -430,7 +434,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -499,6 +506,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y
|
|||
CONFIG_SCSI_LOWLEVEL=y
|
||||
CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -532,7 +536,6 @@ CONFIG_VETH=m
|
|||
# CONFIG_PHYLIB is not set
|
||||
CONFIG_NET_ETHERNET=y
|
||||
# CONFIG_MII is not set
|
||||
CONFIG_APOLLO_ELPLUS=y
|
||||
# CONFIG_IBM_NEW_EMAC_ZMII is not set
|
||||
# CONFIG_IBM_NEW_EMAC_RGMII is not set
|
||||
# CONFIG_IBM_NEW_EMAC_TAH is not set
|
||||
|
|
@ -627,6 +630,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -657,6 +661,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -668,8 +673,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -738,10 +745,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
# CONFIG_LOGO_LINUX_VGA16 is not set
|
||||
# CONFIG_LOGO_LINUX_CLUT224 is not set
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -753,6 +756,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -789,6 +793,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -848,6 +853,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -860,18 +866,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -880,7 +885,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -944,6 +948,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1003,6 +1009,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1044,6 +1054,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:02 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -179,6 +181,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -409,6 +412,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -428,7 +432,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -452,6 +458,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -462,6 +469,7 @@ CONFIG_BLK_DEV_IDE=y
|
|||
#
|
||||
# Please see Documentation/ide/ide.txt for help/info on IDE drives
|
||||
#
|
||||
CONFIG_IDE_ATAPI=y
|
||||
# CONFIG_BLK_DEV_IDE_SATA is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=y
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
|
|
@ -479,8 +487,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_BLK_DEV_PLATFORM is not set
|
||||
CONFIG_BLK_DEV_FALCON_IDE=y
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_HD_ONLY is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
|
|
@ -530,6 +536,7 @@ CONFIG_ISCSI_TCP=m
|
|||
CONFIG_ATARI_SCSI=y
|
||||
# CONFIG_ATARI_SCSI_TOSHIBA_DELAY is not set
|
||||
# CONFIG_ATARI_SCSI_RESET_BOOT is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -538,7 +545,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -547,13 +554,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -666,6 +669,7 @@ CONFIG_SERIO_LIBPS2=y
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -782,10 +789,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_DMASOUND_ATARI=m
|
||||
CONFIG_DMASOUND=m
|
||||
|
|
@ -799,6 +802,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_AUXDISPLAY is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
|
|
@ -806,11 +810,8 @@ CONFIG_HIDRAW=y
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_ATARI_MFPSER=m
|
||||
CONFIG_ATARI_SCC=y
|
||||
CONFIG_ATARI_SCC_DMA=y
|
||||
CONFIG_ATARI_MIDI=m
|
||||
CONFIG_ATARI_DSP56K=m
|
||||
# CONFIG_SERIAL_CONSOLE is not set
|
||||
|
||||
#
|
||||
# File systems
|
||||
|
|
@ -820,8 +821,10 @@ CONFIG_EXT2_FS=y
|
|||
# CONFIG_EXT2_FS_XIP is not set
|
||||
CONFIG_EXT3_FS=y
|
||||
# CONFIG_EXT3_FS_XATTR is not set
|
||||
# CONFIG_EXT4DEV_FS is not set
|
||||
CONFIG_EXT4DEV_FS=y
|
||||
# CONFIG_EXT4DEV_FS_XATTR is not set
|
||||
CONFIG_JBD=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_REISERFS_FS=m
|
||||
# CONFIG_REISERFS_CHECK is not set
|
||||
# CONFIG_REISERFS_PROC_INFO is not set
|
||||
|
|
@ -840,6 +843,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -899,6 +903,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -920,7 +925,6 @@ CONFIG_LOCKD_V4=y
|
|||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
# CONFIG_RPCSEC_GSS_KRB5 is not set
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -929,7 +933,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -994,6 +997,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1053,6 +1058,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=m
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1094,6 +1103,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:03 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -180,6 +182,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m
|
|||
CONFIG_53C700_BE_BUS=y
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_BVME6000_SCSI=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y
|
|||
# Console display driver support
|
||||
#
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -723,6 +727,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -759,6 +764,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -818,6 +824,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -830,18 +837,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -850,7 +856,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -915,6 +920,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -974,6 +981,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1015,6 +1026,7 @@ CONFIG_BITREVERSE=m
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=m
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:04 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -162,10 +168,6 @@ CONFIG_HEARTBEAT=y
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -179,6 +181,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -412,6 +415,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -431,7 +435,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -449,6 +455,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -500,6 +507,7 @@ CONFIG_SCSI_SRP_TGT_ATTRS=y
|
|||
CONFIG_SCSI_LOWLEVEL=y
|
||||
CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -508,7 +516,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -517,13 +525,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -636,6 +640,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -666,6 +671,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -677,8 +683,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -747,10 +755,6 @@ CONFIG_LOGO=y
|
|||
# CONFIG_LOGO_LINUX_MONO is not set
|
||||
# CONFIG_LOGO_LINUX_VGA16 is not set
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -762,6 +766,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -796,6 +801,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -855,6 +861,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -867,18 +874,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -887,7 +893,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -951,6 +956,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1010,6 +1017,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1051,6 +1062,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:06 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -180,6 +182,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -460,6 +467,7 @@ CONFIG_BLK_DEV_IDE=y
|
|||
#
|
||||
# Please see Documentation/ide/ide.txt for help/info on IDE drives
|
||||
#
|
||||
CONFIG_IDE_ATAPI=y
|
||||
# CONFIG_BLK_DEV_IDE_SATA is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=y
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
|
|
@ -477,8 +485,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_BLK_DEV_PLATFORM is not set
|
||||
CONFIG_BLK_DEV_MAC_IDE=y
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_HD_ONLY is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
|
|
@ -527,6 +533,7 @@ CONFIG_ISCSI_TCP=m
|
|||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_MAC_SCSI=y
|
||||
CONFIG_SCSI_MAC_ESP=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -535,7 +542,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -544,9 +551,6 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_MACINTOSH_DRIVERS=y
|
||||
|
|
@ -559,7 +563,6 @@ CONFIG_ADB_CUDA=y
|
|||
CONFIG_INPUT_ADBHID=y
|
||||
CONFIG_MAC_EMUMOUSEBTN=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -670,6 +673,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -700,6 +704,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -711,8 +716,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -784,10 +791,6 @@ CONFIG_LOGO_LINUX_MONO=y
|
|||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
CONFIG_LOGO_MAC_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -799,6 +802,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -836,6 +840,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -895,6 +900,7 @@ CONFIG_HFSPLUS_FS=y
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -917,7 +923,6 @@ CONFIG_EXPORTFS=m
|
|||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=m
|
||||
CONFIG_SUNRPC_GSS=m
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=m
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -926,7 +931,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -991,6 +995,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1050,6 +1056,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=m
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1091,6 +1101,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:07 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -173,10 +179,6 @@ CONFIG_GENERIC_ISA_DMA=y
|
|||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
CONFIG_ZORRO_NAMES=y
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -190,6 +192,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -427,6 +430,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -446,7 +450,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -476,6 +482,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -486,6 +493,7 @@ CONFIG_BLK_DEV_IDE=y
|
|||
#
|
||||
# Please see Documentation/ide/ide.txt for help/info on IDE drives
|
||||
#
|
||||
CONFIG_IDE_ATAPI=y
|
||||
# CONFIG_BLK_DEV_IDE_SATA is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=y
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
|
|
@ -508,8 +516,6 @@ CONFIG_BLK_DEV_FALCON_IDE=y
|
|||
CONFIG_BLK_DEV_MAC_IDE=y
|
||||
CONFIG_BLK_DEV_Q40IDE=y
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_HD_ONLY is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
|
|
@ -584,6 +590,7 @@ CONFIG_MVME147_SCSI=y
|
|||
CONFIG_MVME16x_SCSI=y
|
||||
CONFIG_BVME6000_SCSI=y
|
||||
CONFIG_SUN3X_ESP=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -592,7 +599,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -601,9 +608,6 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_MACINTOSH_DRIVERS=y
|
||||
|
|
@ -616,7 +620,6 @@ CONFIG_ADB_CUDA=y
|
|||
CONFIG_INPUT_ADBHID=y
|
||||
CONFIG_MAC_EMUMOUSEBTN=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -632,7 +635,6 @@ CONFIG_A2065=m
|
|||
CONFIG_HYDRA=m
|
||||
CONFIG_ZORRO8390=m
|
||||
CONFIG_APNE=m
|
||||
CONFIG_APOLLO_ELPLUS=y
|
||||
CONFIG_MAC8390=y
|
||||
CONFIG_MAC89x0=m
|
||||
CONFIG_MACSONIC=m
|
||||
|
|
@ -791,6 +793,7 @@ CONFIG_SERIO_LIBPS2=y
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -827,6 +830,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -838,8 +842,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -923,10 +929,6 @@ CONFIG_LOGO_LINUX_MONO=y
|
|||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
CONFIG_LOGO_MAC_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_DMASOUND_ATARI=m
|
||||
CONFIG_DMASOUND_PAULA=m
|
||||
|
|
@ -942,6 +944,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_AUXDISPLAY is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
|
|
@ -949,8 +952,6 @@ CONFIG_HIDRAW=y
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_ATARI_MFPSER=m
|
||||
CONFIG_ATARI_SCC=y
|
||||
CONFIG_ATARI_SCC_DMA=y
|
||||
CONFIG_ATARI_MIDI=m
|
||||
CONFIG_ATARI_DSP56K=m
|
||||
CONFIG_AMIGA_BUILTIN_SERIAL=y
|
||||
|
|
@ -972,8 +973,10 @@ CONFIG_EXT2_FS=y
|
|||
# CONFIG_EXT2_FS_XIP is not set
|
||||
CONFIG_EXT3_FS=y
|
||||
# CONFIG_EXT3_FS_XATTR is not set
|
||||
# CONFIG_EXT4DEV_FS is not set
|
||||
CONFIG_EXT4DEV_FS=y
|
||||
# CONFIG_EXT4DEV_FS_XATTR is not set
|
||||
CONFIG_JBD=y
|
||||
CONFIG_JBD2=y
|
||||
CONFIG_REISERFS_FS=m
|
||||
# CONFIG_REISERFS_CHECK is not set
|
||||
# CONFIG_REISERFS_PROC_INFO is not set
|
||||
|
|
@ -992,6 +995,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -1051,6 +1055,7 @@ CONFIG_HFSPLUS_FS=y
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -1063,18 +1068,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -1083,7 +1087,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -1152,6 +1155,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1211,6 +1216,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1252,6 +1261,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=y
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:08 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -180,6 +182,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -502,6 +509,7 @@ CONFIG_SCSI_LOWLEVEL=y
|
|||
CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_MVME147_SCSI=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -510,7 +518,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -519,13 +527,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -630,6 +634,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -660,6 +665,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -671,8 +677,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -707,10 +715,6 @@ CONFIG_SSB_POSSIBLE=y
|
|||
# Console display driver support
|
||||
#
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -722,6 +726,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -758,6 +763,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -817,6 +823,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -829,18 +836,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -849,7 +855,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -914,6 +919,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -973,6 +980,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1014,6 +1025,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:09 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -163,10 +169,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -180,6 +182,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -413,6 +416,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -432,7 +436,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -450,6 +456,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -503,6 +510,7 @@ CONFIG_ISCSI_TCP=m
|
|||
CONFIG_53C700_BE_BUS=y
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_MVME16x_SCSI=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -511,7 +519,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -520,13 +528,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -631,6 +635,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -661,6 +666,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -672,8 +678,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -708,10 +716,6 @@ CONFIG_SSB_POSSIBLE=y
|
|||
# Console display driver support
|
||||
#
|
||||
CONFIG_DUMMY_CONSOLE=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -723,6 +727,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -760,6 +765,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -819,6 +825,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -831,18 +838,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -851,7 +857,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -916,6 +921,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -975,6 +982,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1016,6 +1027,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:10 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -163,10 +169,6 @@ CONFIG_ISA=y
|
|||
CONFIG_GENERIC_ISA_DMA=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -180,6 +182,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -448,6 +454,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -458,6 +465,7 @@ CONFIG_BLK_DEV_IDE=y
|
|||
#
|
||||
# Please see Documentation/ide/ide.txt for help/info on IDE drives
|
||||
#
|
||||
CONFIG_IDE_ATAPI=y
|
||||
# CONFIG_BLK_DEV_IDE_SATA is not set
|
||||
CONFIG_BLK_DEV_IDEDISK=y
|
||||
# CONFIG_IDEDISK_MULTI_MODE is not set
|
||||
|
|
@ -475,8 +483,6 @@ CONFIG_IDE_PROC_FS=y
|
|||
# CONFIG_BLK_DEV_PLATFORM is not set
|
||||
CONFIG_BLK_DEV_Q40IDE=y
|
||||
# CONFIG_BLK_DEV_IDEDMA is not set
|
||||
# CONFIG_BLK_DEV_HD_ONLY is not set
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
|
||||
#
|
||||
# SCSI device support
|
||||
|
|
@ -536,6 +542,7 @@ CONFIG_ISCSI_TCP=m
|
|||
# CONFIG_SCSI_SYM53C416 is not set
|
||||
# CONFIG_SCSI_T128 is not set
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -544,7 +551,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -553,13 +560,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -680,6 +683,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -711,6 +715,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -722,8 +727,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -792,10 +799,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
CONFIG_SOUND=m
|
||||
CONFIG_DMASOUND_Q40=m
|
||||
CONFIG_DMASOUND=m
|
||||
|
|
@ -809,6 +812,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -843,6 +847,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -902,6 +907,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -924,7 +930,6 @@ CONFIG_EXPORTFS=m
|
|||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -933,7 +938,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -997,6 +1001,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1056,6 +1062,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1097,6 +1107,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:11 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -149,10 +155,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -166,6 +168,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -399,6 +402,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -418,7 +422,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -436,6 +442,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -488,6 +495,7 @@ CONFIG_SCSI_LOWLEVEL=y
|
|||
CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_SUN3_SCSI=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -496,7 +504,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -505,13 +513,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -527,7 +531,6 @@ CONFIG_SUN3_82586=y
|
|||
# CONFIG_IBM_NEW_EMAC_RGMII is not set
|
||||
# CONFIG_IBM_NEW_EMAC_TAH is not set
|
||||
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
|
||||
# CONFIG_B44 is not set
|
||||
# CONFIG_NETDEV_1000 is not set
|
||||
# CONFIG_NETDEV_10000 is not set
|
||||
|
||||
|
|
@ -617,6 +620,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -647,19 +651,20 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
# Sonics Silicon Backplane
|
||||
#
|
||||
CONFIG_SSB_POSSIBLE=y
|
||||
# CONFIG_SSB is not set
|
||||
|
||||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -727,10 +732,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -776,6 +777,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -835,6 +837,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -847,18 +850,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -867,7 +869,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -932,6 +933,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -991,6 +994,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1032,6 +1039,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux kernel version: 2.6.26-rc4
|
||||
# Wed May 28 22:47:35 2008
|
||||
# Linux kernel version: 2.6.27-rc6
|
||||
# Wed Sep 10 09:02:12 2008
|
||||
#
|
||||
CONFIG_M68K=y
|
||||
CONFIG_MMU=y
|
||||
|
|
@ -52,7 +52,6 @@ CONFIG_SYSCTL=y
|
|||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
||||
CONFIG_HOTPLUG=y
|
||||
|
|
@ -75,10 +74,16 @@ CONFIG_SLAB=y
|
|||
# CONFIG_PROFILING is not set
|
||||
# CONFIG_MARKERS is not set
|
||||
# CONFIG_HAVE_OPROFILE is not set
|
||||
# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
|
||||
# CONFIG_HAVE_IOREMAP_PROT is not set
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
# CONFIG_HAVE_ARCH_TRACEHOOK is not set
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
# CONFIG_USE_GENERIC_SMP_HELPERS is not set
|
||||
# CONFIG_HAVE_CLK is not set
|
||||
CONFIG_PROC_PAGE_MONITOR=y
|
||||
# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
|
||||
CONFIG_SLABINFO=y
|
||||
CONFIG_RT_MUTEXES=y
|
||||
# CONFIG_TINY_SHMEM is not set
|
||||
|
|
@ -95,6 +100,7 @@ CONFIG_BLOCK=y
|
|||
# CONFIG_BLK_DEV_IO_TRACE is not set
|
||||
# CONFIG_LSF is not set
|
||||
CONFIG_BLK_DEV_BSG=y
|
||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||
|
||||
#
|
||||
# IO Schedulers
|
||||
|
|
@ -160,10 +166,6 @@ CONFIG_BINFMT_MISC=m
|
|||
CONFIG_PROC_HARDWARE=y
|
||||
CONFIG_ZONE_DMA=y
|
||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
||||
|
||||
#
|
||||
# Networking
|
||||
#
|
||||
CONFIG_NET=y
|
||||
|
||||
#
|
||||
|
|
@ -177,6 +179,7 @@ CONFIG_XFRM=y
|
|||
# CONFIG_XFRM_SUB_POLICY is not set
|
||||
CONFIG_XFRM_MIGRATE=y
|
||||
# CONFIG_XFRM_STATISTICS is not set
|
||||
CONFIG_XFRM_IPCOMP=m
|
||||
CONFIG_NET_KEY=y
|
||||
CONFIG_NET_KEY_MIGRATE=y
|
||||
CONFIG_INET=y
|
||||
|
|
@ -410,6 +413,7 @@ CONFIG_NET_CLS_ROUTE=y
|
|||
#
|
||||
# CONFIG_CFG80211 is not set
|
||||
CONFIG_WIRELESS_EXT=y
|
||||
# CONFIG_WIRELESS_EXT_SYSFS is not set
|
||||
# CONFIG_MAC80211 is not set
|
||||
CONFIG_IEEE80211=m
|
||||
# CONFIG_IEEE80211_DEBUG is not set
|
||||
|
|
@ -429,7 +433,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m
|
|||
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
||||
CONFIG_STANDALONE=y
|
||||
CONFIG_PREVENT_FIRMWARE_BUILD=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_FW_LOADER=y
|
||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||
CONFIG_EXTRA_FIRMWARE=""
|
||||
# CONFIG_SYS_HYPERVISOR is not set
|
||||
CONFIG_CONNECTOR=m
|
||||
# CONFIG_MTD is not set
|
||||
|
|
@ -447,6 +453,7 @@ CONFIG_CDROM_PKTCDVD=m
|
|||
CONFIG_CDROM_PKTCDVD_BUFFERS=8
|
||||
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
|
||||
CONFIG_ATA_OVER_ETH=m
|
||||
# CONFIG_BLK_DEV_HD is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
# CONFIG_EEPROM_93CX6 is not set
|
||||
# CONFIG_ENCLOSURE_SERVICES is not set
|
||||
|
|
@ -499,6 +506,7 @@ CONFIG_SCSI_LOWLEVEL=y
|
|||
CONFIG_ISCSI_TCP=m
|
||||
# CONFIG_SCSI_DEBUG is not set
|
||||
CONFIG_SUN3X_ESP=y
|
||||
# CONFIG_SCSI_DH is not set
|
||||
CONFIG_MD=y
|
||||
CONFIG_BLK_DEV_MD=m
|
||||
CONFIG_MD_LINEAR=m
|
||||
|
|
@ -507,7 +515,7 @@ CONFIG_MD_RAID1=m
|
|||
# CONFIG_MD_RAID10 is not set
|
||||
CONFIG_MD_RAID456=m
|
||||
CONFIG_MD_RAID5_RESHAPE=y
|
||||
CONFIG_MD_MULTIPATH=m
|
||||
# CONFIG_MD_MULTIPATH is not set
|
||||
# CONFIG_MD_FAULTY is not set
|
||||
CONFIG_BLK_DEV_DM=m
|
||||
# CONFIG_DM_DEBUG is not set
|
||||
|
|
@ -516,13 +524,9 @@ CONFIG_DM_SNAPSHOT=m
|
|||
CONFIG_DM_MIRROR=m
|
||||
CONFIG_DM_ZERO=m
|
||||
CONFIG_DM_MULTIPATH=m
|
||||
CONFIG_DM_MULTIPATH_EMC=m
|
||||
CONFIG_DM_MULTIPATH_RDAC=m
|
||||
CONFIG_DM_MULTIPATH_HP=m
|
||||
# CONFIG_DM_DELAY is not set
|
||||
CONFIG_DM_UEVENT=y
|
||||
CONFIG_NETDEVICES=y
|
||||
# CONFIG_NETDEVICES_MULTIQUEUE is not set
|
||||
CONFIG_DUMMY=m
|
||||
# CONFIG_BONDING is not set
|
||||
CONFIG_MACVLAN=m
|
||||
|
|
@ -627,6 +631,7 @@ CONFIG_SERIO_LIBPS2=m
|
|||
# Character devices
|
||||
#
|
||||
CONFIG_VT=y
|
||||
CONFIG_CONSOLE_TRANSLATIONS=y
|
||||
CONFIG_VT_CONSOLE=y
|
||||
CONFIG_HW_CONSOLE=y
|
||||
CONFIG_VT_HW_CONSOLE_BINDING=y
|
||||
|
|
@ -657,6 +662,7 @@ CONFIG_GEN_RTC_X=y
|
|||
# CONFIG_POWER_SUPPLY is not set
|
||||
# CONFIG_HWMON is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_WATCHDOG is not set
|
||||
|
||||
#
|
||||
|
|
@ -668,8 +674,10 @@ CONFIG_SSB_POSSIBLE=y
|
|||
#
|
||||
# Multifunction device drivers
|
||||
#
|
||||
# CONFIG_MFD_CORE is not set
|
||||
# CONFIG_MFD_SM501 is not set
|
||||
# CONFIG_HTC_PASIC3 is not set
|
||||
# CONFIG_MFD_TMIO is not set
|
||||
|
||||
#
|
||||
# Multimedia devices
|
||||
|
|
@ -737,10 +745,6 @@ CONFIG_LOGO=y
|
|||
CONFIG_LOGO_LINUX_MONO=y
|
||||
CONFIG_LOGO_LINUX_VGA16=y
|
||||
CONFIG_LOGO_LINUX_CLUT224=y
|
||||
|
||||
#
|
||||
# Sound
|
||||
#
|
||||
# CONFIG_SOUND is not set
|
||||
CONFIG_HID_SUPPORT=y
|
||||
CONFIG_HID=m
|
||||
|
|
@ -752,6 +756,7 @@ CONFIG_HIDRAW=y
|
|||
# CONFIG_NEW_LEDS is not set
|
||||
# CONFIG_ACCESSIBILITY is not set
|
||||
# CONFIG_RTC_CLASS is not set
|
||||
# CONFIG_DMADEVICES is not set
|
||||
# CONFIG_UIO is not set
|
||||
|
||||
#
|
||||
|
|
@ -786,6 +791,7 @@ CONFIG_XFS_FS=m
|
|||
CONFIG_OCFS2_FS=m
|
||||
CONFIG_OCFS2_FS_O2CB=m
|
||||
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
|
||||
# CONFIG_OCFS2_FS_STATS is not set
|
||||
# CONFIG_OCFS2_DEBUG_MASKLOG is not set
|
||||
# CONFIG_OCFS2_DEBUG_FS is not set
|
||||
CONFIG_DNOTIFY=y
|
||||
|
|
@ -845,6 +851,7 @@ CONFIG_HFSPLUS_FS=m
|
|||
CONFIG_CRAMFS=m
|
||||
# CONFIG_VXFS_FS is not set
|
||||
CONFIG_MINIX_FS=y
|
||||
# CONFIG_OMFS_FS is not set
|
||||
CONFIG_HPFS_FS=m
|
||||
# CONFIG_QNX4FS_FS is not set
|
||||
# CONFIG_ROMFS_FS is not set
|
||||
|
|
@ -857,18 +864,17 @@ CONFIG_NFS_FS=y
|
|||
CONFIG_NFS_V3=y
|
||||
# CONFIG_NFS_V3_ACL is not set
|
||||
CONFIG_NFS_V4=y
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_NFSD=m
|
||||
CONFIG_NFSD_V3=y
|
||||
# CONFIG_NFSD_V3_ACL is not set
|
||||
# CONFIG_NFSD_V4 is not set
|
||||
CONFIG_ROOT_NFS=y
|
||||
CONFIG_LOCKD=y
|
||||
CONFIG_LOCKD_V4=y
|
||||
CONFIG_EXPORTFS=m
|
||||
CONFIG_NFS_COMMON=y
|
||||
CONFIG_SUNRPC=y
|
||||
CONFIG_SUNRPC_GSS=y
|
||||
CONFIG_SUNRPC_BIND34=y
|
||||
CONFIG_RPCSEC_GSS_KRB5=y
|
||||
# CONFIG_RPCSEC_GSS_SPKM3 is not set
|
||||
CONFIG_SMB_FS=m
|
||||
|
|
@ -877,7 +883,6 @@ CONFIG_SMB_NLS_REMOTE="cp437"
|
|||
# CONFIG_CIFS is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
CONFIG_CODA_FS=m
|
||||
# CONFIG_CODA_FS_OLD_API is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
||||
#
|
||||
|
|
@ -942,6 +947,8 @@ CONFIG_MAGIC_SYSRQ=y
|
|||
# CONFIG_HEADERS_CHECK is not set
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
CONFIG_DEBUG_BUGVERBOSE=y
|
||||
CONFIG_DEBUG_MEMORY_INIT=y
|
||||
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
||||
# CONFIG_SAMPLES is not set
|
||||
|
||||
#
|
||||
|
|
@ -1001,6 +1008,10 @@ CONFIG_CRYPTO_CRC32C=m
|
|||
CONFIG_CRYPTO_MD4=m
|
||||
CONFIG_CRYPTO_MD5=y
|
||||
CONFIG_CRYPTO_MICHAEL_MIC=m
|
||||
CONFIG_CRYPTO_RMD128=m
|
||||
CONFIG_CRYPTO_RMD160=m
|
||||
CONFIG_CRYPTO_RMD256=m
|
||||
CONFIG_CRYPTO_RMD320=m
|
||||
CONFIG_CRYPTO_SHA1=m
|
||||
CONFIG_CRYPTO_SHA256=m
|
||||
CONFIG_CRYPTO_SHA512=m
|
||||
|
|
@ -1042,6 +1053,7 @@ CONFIG_BITREVERSE=y
|
|||
# CONFIG_GENERIC_FIND_NEXT_BIT is not set
|
||||
CONFIG_CRC_CCITT=m
|
||||
CONFIG_CRC16=m
|
||||
CONFIG_CRC_T10DIF=y
|
||||
CONFIG_CRC_ITU_T=m
|
||||
CONFIG_CRC32=y
|
||||
# CONFIG_CRC7 is not set
|
||||
|
|
|
|||
|
|
@ -72,6 +72,7 @@ static void irq_dispatch(unsigned int irq)
|
|||
cascade = irq_cascade + irq;
|
||||
if (cascade->get_irq != NULL) {
|
||||
unsigned int source_irq = irq;
|
||||
int ret;
|
||||
desc = irq_desc + source_irq;
|
||||
if (desc->chip->mask_ack)
|
||||
desc->chip->mask_ack(source_irq);
|
||||
|
|
@ -79,8 +80,9 @@ static void irq_dispatch(unsigned int irq)
|
|||
desc->chip->mask(source_irq);
|
||||
desc->chip->ack(source_irq);
|
||||
}
|
||||
irq = cascade->get_irq(irq);
|
||||
if (irq < 0)
|
||||
ret = cascade->get_irq(irq);
|
||||
irq = ret;
|
||||
if (ret < 0)
|
||||
atomic_inc(&irq_err_count);
|
||||
else
|
||||
irq_dispatch(irq);
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
|
|||
* If we're in an interrupt or have no user
|
||||
* context, we must not take the fault..
|
||||
*/
|
||||
if (in_interrupt() || !mm)
|
||||
if (in_atomic() || !mm)
|
||||
goto no_context;
|
||||
|
||||
down_read(&mm->mmap_sem);
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ static int of_bus_sbus_map(u32 *addr, const u32 *range, int na, int ns, int pna)
|
|||
return of_bus_default_map(addr, range, na, ns, pna);
|
||||
}
|
||||
|
||||
static unsigned int of_bus_sbus_get_flags(const u32 *addr)
|
||||
static unsigned long of_bus_sbus_get_flags(const u32 *addr, unsigned long flags)
|
||||
{
|
||||
return IORESOURCE_MEM;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ static const struct user_regset sparc32_regsets[] = {
|
|||
*/
|
||||
[REGSET_GENERAL] = {
|
||||
.core_note_type = NT_PRSTATUS,
|
||||
.n = 38 * sizeof(u32),
|
||||
.n = 38,
|
||||
.size = sizeof(u32), .align = sizeof(u32),
|
||||
.get = genregs32_get, .set = genregs32_set
|
||||
},
|
||||
|
|
@ -304,7 +304,7 @@ static const struct user_regset sparc32_regsets[] = {
|
|||
*/
|
||||
[REGSET_FP] = {
|
||||
.core_note_type = NT_PRFPREG,
|
||||
.n = 99 * sizeof(u32),
|
||||
.n = 99,
|
||||
.size = sizeof(u32), .align = sizeof(u32),
|
||||
.get = fpregs32_get, .set = fpregs32_set
|
||||
},
|
||||
|
|
|
|||
|
|
@ -744,16 +744,16 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
|
|||
* the second will just error out since we do not pass in
|
||||
* IRQF_SHARED.
|
||||
*/
|
||||
err = request_irq(op->irqs[1], psycho_ue_intr, 0,
|
||||
err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
|
||||
"PSYCHO_UE", pbm);
|
||||
err = request_irq(op->irqs[2], psycho_ce_intr, 0,
|
||||
err = request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED,
|
||||
"PSYCHO_CE", pbm);
|
||||
|
||||
/* This one, however, ought not to fail. We can just warn
|
||||
* about it since the system can still operate properly even
|
||||
* if this fails.
|
||||
*/
|
||||
err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
|
||||
err = request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,
|
||||
"PSYCHO_PCIERR", pbm);
|
||||
if (err)
|
||||
printk(KERN_WARNING "%s: Could not register PCIERR, "
|
||||
|
|
|
|||
|
|
@ -156,55 +156,11 @@ static unsigned long psycho_pcislot_imap_offset(unsigned long ino)
|
|||
return PSYCHO_IMAP_B_SLOT0 + (slot * 8);
|
||||
}
|
||||
|
||||
#define PSYCHO_IMAP_SCSI 0x1000UL
|
||||
#define PSYCHO_IMAP_ETH 0x1008UL
|
||||
#define PSYCHO_IMAP_BPP 0x1010UL
|
||||
#define PSYCHO_IMAP_AU_REC 0x1018UL
|
||||
#define PSYCHO_IMAP_AU_PLAY 0x1020UL
|
||||
#define PSYCHO_IMAP_PFAIL 0x1028UL
|
||||
#define PSYCHO_IMAP_KMS 0x1030UL
|
||||
#define PSYCHO_IMAP_FLPY 0x1038UL
|
||||
#define PSYCHO_IMAP_SHW 0x1040UL
|
||||
#define PSYCHO_IMAP_KBD 0x1048UL
|
||||
#define PSYCHO_IMAP_MS 0x1050UL
|
||||
#define PSYCHO_IMAP_SER 0x1058UL
|
||||
#define PSYCHO_IMAP_TIM0 0x1060UL
|
||||
#define PSYCHO_IMAP_TIM1 0x1068UL
|
||||
#define PSYCHO_IMAP_UE 0x1070UL
|
||||
#define PSYCHO_IMAP_CE 0x1078UL
|
||||
#define PSYCHO_IMAP_A_ERR 0x1080UL
|
||||
#define PSYCHO_IMAP_B_ERR 0x1088UL
|
||||
#define PSYCHO_IMAP_PMGMT 0x1090UL
|
||||
#define PSYCHO_IMAP_GFX 0x1098UL
|
||||
#define PSYCHO_IMAP_EUPA 0x10a0UL
|
||||
#define PSYCHO_OBIO_IMAP_BASE 0x1000UL
|
||||
|
||||
static unsigned long __psycho_onboard_imap_off[] = {
|
||||
/*0x20*/ PSYCHO_IMAP_SCSI,
|
||||
/*0x21*/ PSYCHO_IMAP_ETH,
|
||||
/*0x22*/ PSYCHO_IMAP_BPP,
|
||||
/*0x23*/ PSYCHO_IMAP_AU_REC,
|
||||
/*0x24*/ PSYCHO_IMAP_AU_PLAY,
|
||||
/*0x25*/ PSYCHO_IMAP_PFAIL,
|
||||
/*0x26*/ PSYCHO_IMAP_KMS,
|
||||
/*0x27*/ PSYCHO_IMAP_FLPY,
|
||||
/*0x28*/ PSYCHO_IMAP_SHW,
|
||||
/*0x29*/ PSYCHO_IMAP_KBD,
|
||||
/*0x2a*/ PSYCHO_IMAP_MS,
|
||||
/*0x2b*/ PSYCHO_IMAP_SER,
|
||||
/*0x2c*/ PSYCHO_IMAP_TIM0,
|
||||
/*0x2d*/ PSYCHO_IMAP_TIM1,
|
||||
/*0x2e*/ PSYCHO_IMAP_UE,
|
||||
/*0x2f*/ PSYCHO_IMAP_CE,
|
||||
/*0x30*/ PSYCHO_IMAP_A_ERR,
|
||||
/*0x31*/ PSYCHO_IMAP_B_ERR,
|
||||
/*0x32*/ PSYCHO_IMAP_PMGMT,
|
||||
/*0x33*/ PSYCHO_IMAP_GFX,
|
||||
/*0x34*/ PSYCHO_IMAP_EUPA,
|
||||
};
|
||||
#define PSYCHO_ONBOARD_IRQ_BASE 0x20
|
||||
#define PSYCHO_ONBOARD_IRQ_LAST 0x34
|
||||
#define psycho_onboard_imap_offset(__ino) \
|
||||
__psycho_onboard_imap_off[(__ino) - PSYCHO_ONBOARD_IRQ_BASE]
|
||||
(PSYCHO_OBIO_IMAP_BASE + (((__ino) & 0x1f) << 3))
|
||||
|
||||
#define PSYCHO_ICLR_A_SLOT0 0x1400UL
|
||||
#define PSYCHO_ICLR_SCSI 0x1800UL
|
||||
|
|
@ -228,10 +184,6 @@ static unsigned int psycho_irq_build(struct device_node *dp,
|
|||
imap_off = psycho_pcislot_imap_offset(ino);
|
||||
} else {
|
||||
/* Onboard device */
|
||||
if (ino > PSYCHO_ONBOARD_IRQ_LAST) {
|
||||
prom_printf("psycho_irq_build: Wacky INO [%x]\n", ino);
|
||||
prom_halt();
|
||||
}
|
||||
imap_off = psycho_onboard_imap_offset(ino);
|
||||
}
|
||||
|
||||
|
|
@ -318,23 +270,6 @@ static void sabre_wsync_handler(unsigned int ino, void *_arg1, void *_arg2)
|
|||
|
||||
#define SABRE_IMAP_A_SLOT0 0x0c00UL
|
||||
#define SABRE_IMAP_B_SLOT0 0x0c20UL
|
||||
#define SABRE_IMAP_SCSI 0x1000UL
|
||||
#define SABRE_IMAP_ETH 0x1008UL
|
||||
#define SABRE_IMAP_BPP 0x1010UL
|
||||
#define SABRE_IMAP_AU_REC 0x1018UL
|
||||
#define SABRE_IMAP_AU_PLAY 0x1020UL
|
||||
#define SABRE_IMAP_PFAIL 0x1028UL
|
||||
#define SABRE_IMAP_KMS 0x1030UL
|
||||
#define SABRE_IMAP_FLPY 0x1038UL
|
||||
#define SABRE_IMAP_SHW 0x1040UL
|
||||
#define SABRE_IMAP_KBD 0x1048UL
|
||||
#define SABRE_IMAP_MS 0x1050UL
|
||||
#define SABRE_IMAP_SER 0x1058UL
|
||||
#define SABRE_IMAP_UE 0x1070UL
|
||||
#define SABRE_IMAP_CE 0x1078UL
|
||||
#define SABRE_IMAP_PCIERR 0x1080UL
|
||||
#define SABRE_IMAP_GFX 0x1098UL
|
||||
#define SABRE_IMAP_EUPA 0x10a0UL
|
||||
#define SABRE_ICLR_A_SLOT0 0x1400UL
|
||||
#define SABRE_ICLR_B_SLOT0 0x1480UL
|
||||
#define SABRE_ICLR_SCSI 0x1800UL
|
||||
|
|
@ -364,33 +299,10 @@ static unsigned long sabre_pcislot_imap_offset(unsigned long ino)
|
|||
return SABRE_IMAP_B_SLOT0 + (slot * 8);
|
||||
}
|
||||
|
||||
static unsigned long __sabre_onboard_imap_off[] = {
|
||||
/*0x20*/ SABRE_IMAP_SCSI,
|
||||
/*0x21*/ SABRE_IMAP_ETH,
|
||||
/*0x22*/ SABRE_IMAP_BPP,
|
||||
/*0x23*/ SABRE_IMAP_AU_REC,
|
||||
/*0x24*/ SABRE_IMAP_AU_PLAY,
|
||||
/*0x25*/ SABRE_IMAP_PFAIL,
|
||||
/*0x26*/ SABRE_IMAP_KMS,
|
||||
/*0x27*/ SABRE_IMAP_FLPY,
|
||||
/*0x28*/ SABRE_IMAP_SHW,
|
||||
/*0x29*/ SABRE_IMAP_KBD,
|
||||
/*0x2a*/ SABRE_IMAP_MS,
|
||||
/*0x2b*/ SABRE_IMAP_SER,
|
||||
/*0x2c*/ 0 /* reserved */,
|
||||
/*0x2d*/ 0 /* reserved */,
|
||||
/*0x2e*/ SABRE_IMAP_UE,
|
||||
/*0x2f*/ SABRE_IMAP_CE,
|
||||
/*0x30*/ SABRE_IMAP_PCIERR,
|
||||
/*0x31*/ 0 /* reserved */,
|
||||
/*0x32*/ 0 /* reserved */,
|
||||
/*0x33*/ SABRE_IMAP_GFX,
|
||||
/*0x34*/ SABRE_IMAP_EUPA,
|
||||
};
|
||||
#define SABRE_ONBOARD_IRQ_BASE 0x20
|
||||
#define SABRE_ONBOARD_IRQ_LAST 0x30
|
||||
#define SABRE_OBIO_IMAP_BASE 0x1000UL
|
||||
#define SABRE_ONBOARD_IRQ_BASE 0x20
|
||||
#define sabre_onboard_imap_offset(__ino) \
|
||||
__sabre_onboard_imap_off[(__ino) - SABRE_ONBOARD_IRQ_BASE]
|
||||
(SABRE_OBIO_IMAP_BASE + (((__ino) & 0x1f) << 3))
|
||||
|
||||
#define sabre_iclr_offset(ino) \
|
||||
((ino & 0x20) ? (SABRE_ICLR_SCSI + (((ino) & 0x1f) << 3)) : \
|
||||
|
|
@ -453,10 +365,6 @@ static unsigned int sabre_irq_build(struct device_node *dp,
|
|||
imap_off = sabre_pcislot_imap_offset(ino);
|
||||
} else {
|
||||
/* onboard device */
|
||||
if (ino > SABRE_ONBOARD_IRQ_LAST) {
|
||||
prom_printf("sabre_irq_build: Wacky INO [%x]\n", ino);
|
||||
prom_halt();
|
||||
}
|
||||
imap_off = sabre_onboard_imap_offset(ino);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -443,7 +443,7 @@ static const struct user_regset sparc64_regsets[] = {
|
|||
*/
|
||||
[REGSET_GENERAL] = {
|
||||
.core_note_type = NT_PRSTATUS,
|
||||
.n = 36 * sizeof(u64),
|
||||
.n = 36,
|
||||
.size = sizeof(u64), .align = sizeof(u64),
|
||||
.get = genregs64_get, .set = genregs64_set
|
||||
},
|
||||
|
|
@ -455,7 +455,7 @@ static const struct user_regset sparc64_regsets[] = {
|
|||
*/
|
||||
[REGSET_FP] = {
|
||||
.core_note_type = NT_PRFPREG,
|
||||
.n = 35 * sizeof(u64),
|
||||
.n = 35,
|
||||
.size = sizeof(u64), .align = sizeof(u64),
|
||||
.get = fpregs64_get, .set = fpregs64_set
|
||||
},
|
||||
|
|
@ -801,7 +801,7 @@ static const struct user_regset sparc32_regsets[] = {
|
|||
*/
|
||||
[REGSET_GENERAL] = {
|
||||
.core_note_type = NT_PRSTATUS,
|
||||
.n = 38 * sizeof(u32),
|
||||
.n = 38,
|
||||
.size = sizeof(u32), .align = sizeof(u32),
|
||||
.get = genregs32_get, .set = genregs32_set
|
||||
},
|
||||
|
|
@ -817,7 +817,7 @@ static const struct user_regset sparc32_regsets[] = {
|
|||
*/
|
||||
[REGSET_FP] = {
|
||||
.core_note_type = NT_PRFPREG,
|
||||
.n = 99 * sizeof(u32),
|
||||
.n = 99,
|
||||
.size = sizeof(u32), .align = sizeof(u32),
|
||||
.get = fpregs32_get, .set = fpregs32_set
|
||||
},
|
||||
|
|
|
|||
|
|
@ -711,6 +711,10 @@ static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp)
|
|||
u64 *spte;
|
||||
int young = 0;
|
||||
|
||||
/* always return old for EPT */
|
||||
if (!shadow_accessed_mask)
|
||||
return 0;
|
||||
|
||||
spte = rmap_next(kvm, rmapp, NULL);
|
||||
while (spte) {
|
||||
int _young;
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ static int npt = 1;
|
|||
module_param(npt, int, S_IRUGO);
|
||||
|
||||
static void kvm_reput_irq(struct vcpu_svm *svm);
|
||||
static void svm_flush_tlb(struct kvm_vcpu *vcpu);
|
||||
|
||||
static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
|
|
@ -878,6 +879,10 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
|
|||
static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
|
||||
{
|
||||
unsigned long host_cr4_mce = read_cr4() & X86_CR4_MCE;
|
||||
unsigned long old_cr4 = to_svm(vcpu)->vmcb->save.cr4;
|
||||
|
||||
if (npt_enabled && ((old_cr4 ^ cr4) & X86_CR4_PGE))
|
||||
force_new_asid(vcpu);
|
||||
|
||||
vcpu->arch.cr4 = cr4;
|
||||
if (!npt_enabled)
|
||||
|
|
@ -1027,6 +1032,13 @@ static int pf_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)
|
|||
KVMTRACE_3D(TDP_FAULT, &svm->vcpu, error_code,
|
||||
(u32)fault_address, (u32)(fault_address >> 32),
|
||||
handler);
|
||||
/*
|
||||
* FIXME: Tis shouldn't be necessary here, but there is a flush
|
||||
* missing in the MMU code. Until we find this bug, flush the
|
||||
* complete TLB here on an NPF
|
||||
*/
|
||||
if (npt_enabled)
|
||||
svm_flush_tlb(&svm->vcpu);
|
||||
|
||||
if (event_injection)
|
||||
kvm_mmu_unprotect_page_virt(&svm->vcpu, fault_address);
|
||||
|
|
|
|||
|
|
@ -3301,8 +3301,7 @@ static int __init vmx_init(void)
|
|||
kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
|
||||
VMX_EPT_WRITABLE_MASK |
|
||||
VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT);
|
||||
kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,
|
||||
VMX_EPT_FAKE_DIRTY_MASK, 0ull,
|
||||
kvm_mmu_set_mask_ptes(0ull, 0ull, 0ull, 0ull,
|
||||
VMX_EPT_EXECUTABLE_MASK);
|
||||
kvm_enable_tdp();
|
||||
} else
|
||||
|
|
|
|||
|
|
@ -370,8 +370,6 @@ enum vmcs_field {
|
|||
#define VMX_EPT_READABLE_MASK 0x1ull
|
||||
#define VMX_EPT_WRITABLE_MASK 0x2ull
|
||||
#define VMX_EPT_EXECUTABLE_MASK 0x4ull
|
||||
#define VMX_EPT_FAKE_ACCESSED_MASK (1ull << 62)
|
||||
#define VMX_EPT_FAKE_DIRTY_MASK (1ull << 63)
|
||||
|
||||
#define VMX_EPT_IDENTITY_PAGETABLE_ADDR 0xfffbc000ul
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,7 @@ int blk_verify_command(struct blk_cmd_filter *filter,
|
|||
}
|
||||
EXPORT_SYMBOL(blk_verify_command);
|
||||
|
||||
#if 0
|
||||
/* and now, the sysfs stuff */
|
||||
static ssize_t rcf_cmds_show(struct blk_cmd_filter *filter, char *page,
|
||||
int rw)
|
||||
|
|
@ -233,3 +234,4 @@ void blk_unregister_filter(struct gendisk *disk)
|
|||
kobject_put(disk->holder_dir->parent);
|
||||
}
|
||||
EXPORT_SYMBOL(blk_unregister_filter);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1499,7 +1499,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,
|
|||
* off.
|
||||
*/
|
||||
if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x2652) {
|
||||
int rc = piix_disable_ahci(pdev);
|
||||
rc = piix_disable_ahci(pdev);
|
||||
if (rc)
|
||||
return rc;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@ enum {
|
|||
PORT_SCR = 0x20,
|
||||
|
||||
/* HOST_CTL bits */
|
||||
HCTL_LEDEN = (1 << 3), /* enable LED operation */
|
||||
HCTL_IRQOFF = (1 << 8), /* global IRQ off */
|
||||
HCTL_FTHD0 = (1 << 10), /* fifo threshold 0 */
|
||||
HCTL_FTHD1 = (1 << 11), /* fifo threshold 1*/
|
||||
|
|
@ -540,7 +541,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc)
|
|||
void __iomem *port_base = inic_port_base(ap);
|
||||
|
||||
/* fire up the ADMA engine */
|
||||
writew(HCTL_FTHD0, port_base + HOST_CTL);
|
||||
writew(HCTL_FTHD0 | HCTL_LEDEN, port_base + HOST_CTL);
|
||||
writew(IDMA_CTL_GO, port_base + PORT_IDMA_CTL);
|
||||
writeb(0, port_base + PORT_CPB_PTQFIFO);
|
||||
|
||||
|
|
|
|||
|
|
@ -1157,6 +1157,8 @@ static int aead_authenc_givencrypt(
|
|||
edesc->desc.hdr = ctx->desc_hdr_template | DESC_HDR_MODE0_ENCRYPT;
|
||||
|
||||
memcpy(req->giv, ctx->iv, crypto_aead_ivsize(authenc));
|
||||
/* avoid consecutive packets going out with same IV */
|
||||
*(__be64 *)req->giv ^= cpu_to_be64(req->seq);
|
||||
|
||||
return ipsec_esp(edesc, areq, req->giv, req->seq,
|
||||
ipsec_esp_encrypt_done);
|
||||
|
|
@ -1449,6 +1451,8 @@ static int talitos_probe(struct of_device *ofdev,
|
|||
|
||||
priv->ofdev = ofdev;
|
||||
|
||||
INIT_LIST_HEAD(&priv->alg_list);
|
||||
|
||||
tasklet_init(&priv->done_task, talitos_done, (unsigned long)dev);
|
||||
tasklet_init(&priv->error_task, talitos_error, (unsigned long)dev);
|
||||
|
||||
|
|
@ -1575,8 +1579,6 @@ static int talitos_probe(struct of_device *ofdev,
|
|||
}
|
||||
|
||||
/* register crypto algorithms the device supports */
|
||||
INIT_LIST_HEAD(&priv->alg_list);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(driver_algs); i++) {
|
||||
if (hw_supports(dev, driver_algs[i].desc_hdr_template)) {
|
||||
struct talitos_crypto_alg *t_alg;
|
||||
|
|
|
|||
|
|
@ -1933,7 +1933,6 @@ static void ide_cd_remove(ide_drive_t *drive)
|
|||
|
||||
ide_proc_unregister_driver(drive, info->driver);
|
||||
|
||||
blk_unregister_filter(info->disk);
|
||||
del_gendisk(info->disk);
|
||||
|
||||
ide_cd_put(info);
|
||||
|
|
@ -2159,7 +2158,6 @@ static int ide_cd_probe(ide_drive_t *drive)
|
|||
g->fops = &idecd_ops;
|
||||
g->flags |= GENHD_FL_REMOVABLE;
|
||||
add_disk(g);
|
||||
blk_register_filter(g);
|
||||
return 0;
|
||||
|
||||
out_free_cd:
|
||||
|
|
|
|||
|
|
@ -613,6 +613,14 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static struct hpt_info *hpt3xx_get_info(struct device *dev)
|
||||
{
|
||||
struct ide_host *host = dev_get_drvdata(dev);
|
||||
struct hpt_info *info = (struct hpt_info *)host->host_priv;
|
||||
|
||||
return dev == host->dev[1] ? info + 1 : info;
|
||||
}
|
||||
|
||||
/*
|
||||
* The Marvell bridge chips used on the HighPoint SATA cards do not seem
|
||||
* to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes...
|
||||
|
|
@ -621,9 +629,7 @@ static int check_in_drive_list(ide_drive_t *drive, const char **list)
|
|||
static u8 hpt3xx_udma_filter(ide_drive_t *drive)
|
||||
{
|
||||
ide_hwif_t *hwif = HWIF(drive);
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
u8 mask = hwif->ultra_mask;
|
||||
|
||||
switch (info->chip_type) {
|
||||
|
|
@ -662,9 +668,7 @@ static u8 hpt3xx_udma_filter(ide_drive_t *drive)
|
|||
static u8 hpt3xx_mdma_filter(ide_drive_t *drive)
|
||||
{
|
||||
ide_hwif_t *hwif = HWIF(drive);
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
|
||||
switch (info->chip_type) {
|
||||
case HPT372 :
|
||||
|
|
@ -700,8 +704,7 @@ static void hpt3xx_set_mode(ide_drive_t *drive, const u8 speed)
|
|||
{
|
||||
ide_hwif_t *hwif = drive->hwif;
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
struct hpt_timings *t = info->timings;
|
||||
u8 itr_addr = 0x40 + (drive->dn * 4);
|
||||
u32 old_itr = 0;
|
||||
|
|
@ -744,8 +747,7 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
|
|||
{
|
||||
ide_hwif_t *hwif = HWIF(drive);
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
|
||||
if (drive->quirk_list) {
|
||||
if (info->chip_type >= HPT370) {
|
||||
|
|
@ -973,8 +975,7 @@ static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f
|
|||
static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
|
||||
{
|
||||
unsigned long io_base = pci_resource_start(dev, 4);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (&dev->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(&dev->dev);
|
||||
const char *name = DRV_NAME;
|
||||
u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */
|
||||
u8 chip_type;
|
||||
|
|
@ -1217,8 +1218,7 @@ static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev)
|
|||
static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
u8 chip_type = info->chip_type;
|
||||
u8 scr1 = 0, ata66 = hwif->channel ? 0x01 : 0x02;
|
||||
|
||||
|
|
@ -1262,8 +1262,7 @@ static u8 hpt3xx_cable_detect(ide_hwif_t *hwif)
|
|||
static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
|
||||
{
|
||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||
struct ide_host *host = pci_get_drvdata(dev);
|
||||
struct hpt_info *info = host->host_priv + (hwif->dev == host->dev[1]);
|
||||
struct hpt_info *info = hpt3xx_get_info(hwif->dev);
|
||||
int serialize = HPT_SERIALIZE_IO;
|
||||
u8 chip_type = info->chip_type;
|
||||
u8 new_mcr, old_mcr = 0;
|
||||
|
|
|
|||
|
|
@ -968,7 +968,7 @@ config VIDEO_PXA27x
|
|||
|
||||
config VIDEO_SH_MOBILE_CEU
|
||||
tristate "SuperH Mobile CEU Interface driver"
|
||||
depends on VIDEO_DEV
|
||||
depends on VIDEO_DEV && HAS_DMA
|
||||
select SOC_CAMERA
|
||||
select VIDEOBUF_DMA_CONTIG
|
||||
---help---
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ static void memstick_free(struct device *dev)
|
|||
}
|
||||
|
||||
static struct class memstick_host_class = {
|
||||
.name = "memstick_host",
|
||||
.name = "memstick_host",
|
||||
.dev_release = memstick_free
|
||||
};
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ EXPORT_SYMBOL(memstick_new_req);
|
|||
* @sg - TPC argument
|
||||
*/
|
||||
void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
|
||||
struct scatterlist *sg)
|
||||
const struct scatterlist *sg)
|
||||
{
|
||||
mrq->tpc = tpc;
|
||||
if (tpc & 8)
|
||||
|
|
@ -294,7 +294,7 @@ EXPORT_SYMBOL(memstick_init_req_sg);
|
|||
* user supplied buffer.
|
||||
*/
|
||||
void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
|
||||
void *buf, size_t length)
|
||||
const void *buf, size_t length)
|
||||
{
|
||||
mrq->tpc = tpc;
|
||||
if (tpc & 8)
|
||||
|
|
@ -439,7 +439,7 @@ static void memstick_check(struct work_struct *work)
|
|||
if (!host->card) {
|
||||
if (memstick_power_on(host))
|
||||
goto out_power_off;
|
||||
} else
|
||||
} else if (host->card->stop)
|
||||
host->card->stop(host->card);
|
||||
|
||||
card = memstick_alloc_card(host);
|
||||
|
|
@ -458,7 +458,7 @@ static void memstick_check(struct work_struct *work)
|
|||
|| !(host->card->check(host->card))) {
|
||||
device_unregister(&host->card->dev);
|
||||
host->card = NULL;
|
||||
} else
|
||||
} else if (host->card->start)
|
||||
host->card->start(host->card);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,8 @@ module_param(major, int, 0644);
|
|||
#define MSPRO_BLOCK_SIGNATURE 0xa5c3
|
||||
#define MSPRO_BLOCK_MAX_ATTRIBUTES 41
|
||||
|
||||
#define MSPRO_BLOCK_PART_SHIFT 3
|
||||
|
||||
enum {
|
||||
MSPRO_BLOCK_ID_SYSINFO = 0x10,
|
||||
MSPRO_BLOCK_ID_MODELNAME = 0x15,
|
||||
|
|
@ -195,7 +197,7 @@ static int mspro_block_bd_open(struct inode *inode, struct file *filp)
|
|||
static int mspro_block_disk_release(struct gendisk *disk)
|
||||
{
|
||||
struct mspro_block_data *msb = disk->private_data;
|
||||
int disk_id = disk->first_minor >> MEMSTICK_PART_SHIFT;
|
||||
int disk_id = disk->first_minor >> MSPRO_BLOCK_PART_SHIFT;
|
||||
|
||||
mutex_lock(&mspro_block_disk_lock);
|
||||
|
||||
|
|
@ -877,6 +879,7 @@ static int mspro_block_switch_interface(struct memstick_dev *card)
|
|||
struct mspro_block_data *msb = memstick_get_drvdata(card);
|
||||
int rc = 0;
|
||||
|
||||
try_again:
|
||||
if (msb->caps & MEMSTICK_CAP_PAR4)
|
||||
rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4);
|
||||
else
|
||||
|
|
@ -930,6 +933,18 @@ static int mspro_block_switch_interface(struct memstick_dev *card)
|
|||
rc = memstick_set_rw_addr(card);
|
||||
if (!rc)
|
||||
rc = mspro_block_set_interface(card, msb->system);
|
||||
|
||||
if (!rc) {
|
||||
msleep(150);
|
||||
rc = mspro_block_wait_for_ced(card);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
if (msb->caps & MEMSTICK_CAP_PAR8) {
|
||||
msb->caps &= ~MEMSTICK_CAP_PAR8;
|
||||
goto try_again;
|
||||
}
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
|
@ -1117,14 +1132,16 @@ static int mspro_block_init_card(struct memstick_dev *card)
|
|||
return -EIO;
|
||||
|
||||
msb->caps = host->caps;
|
||||
|
||||
msleep(150);
|
||||
rc = mspro_block_wait_for_ced(card);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = mspro_block_switch_interface(card);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
msleep(200);
|
||||
rc = mspro_block_wait_for_ced(card);
|
||||
if (rc)
|
||||
return rc;
|
||||
dev_dbg(&card->dev, "card activated\n");
|
||||
if (msb->system != MEMSTICK_SYS_SERIAL)
|
||||
msb->caps |= MEMSTICK_CAP_AUTO_GET_INT;
|
||||
|
|
@ -1192,12 +1209,12 @@ static int mspro_block_init_disk(struct memstick_dev *card)
|
|||
if (rc)
|
||||
return rc;
|
||||
|
||||
if ((disk_id << MEMSTICK_PART_SHIFT) > 255) {
|
||||
if ((disk_id << MSPRO_BLOCK_PART_SHIFT) > 255) {
|
||||
rc = -ENOSPC;
|
||||
goto out_release_id;
|
||||
}
|
||||
|
||||
msb->disk = alloc_disk(1 << MEMSTICK_PART_SHIFT);
|
||||
msb->disk = alloc_disk(1 << MSPRO_BLOCK_PART_SHIFT);
|
||||
if (!msb->disk) {
|
||||
rc = -ENOMEM;
|
||||
goto out_release_id;
|
||||
|
|
@ -1220,7 +1237,7 @@ static int mspro_block_init_disk(struct memstick_dev *card)
|
|||
MSPRO_BLOCK_MAX_PAGES * msb->page_size);
|
||||
|
||||
msb->disk->major = major;
|
||||
msb->disk->first_minor = disk_id << MEMSTICK_PART_SHIFT;
|
||||
msb->disk->first_minor = disk_id << MSPRO_BLOCK_PART_SHIFT;
|
||||
msb->disk->fops = &ms_block_bdops;
|
||||
msb->usage_count = 1;
|
||||
msb->disk->private_data = msb;
|
||||
|
|
@ -1416,7 +1433,7 @@ static int mspro_block_resume(struct memstick_dev *card)
|
|||
|
||||
static struct memstick_device_id mspro_block_id_tbl[] = {
|
||||
{MEMSTICK_MATCH_ALL, MEMSTICK_TYPE_PRO, MEMSTICK_CATEGORY_STORAGE_DUO,
|
||||
MEMSTICK_CLASS_GENERIC_DUO},
|
||||
MEMSTICK_CLASS_DUO},
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ struct jmb38x_ms {
|
|||
#define TPC_CODE_SZ_MASK 0x00000700
|
||||
#define TPC_DATA_SZ_MASK 0x00000007
|
||||
|
||||
#define HOST_CONTROL_TDELAY_EN 0x00040000
|
||||
#define HOST_CONTROL_HW_OC_P 0x00010000
|
||||
#define HOST_CONTROL_RESET_REQ 0x00008000
|
||||
#define HOST_CONTROL_REI 0x00004000
|
||||
#define HOST_CONTROL_LED 0x00000400
|
||||
|
|
@ -88,6 +90,7 @@ struct jmb38x_ms {
|
|||
#define HOST_CONTROL_RESET 0x00000100
|
||||
#define HOST_CONTROL_POWER_EN 0x00000080
|
||||
#define HOST_CONTROL_CLOCK_EN 0x00000040
|
||||
#define HOST_CONTROL_REO 0x00000008
|
||||
#define HOST_CONTROL_IF_SHIFT 4
|
||||
|
||||
#define HOST_CONTROL_IF_SERIAL 0x0
|
||||
|
|
@ -133,11 +136,15 @@ struct jmb38x_ms {
|
|||
#define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000
|
||||
|
||||
#define CLOCK_CONTROL_40MHZ 0x00000001
|
||||
#define CLOCK_CONTROL_50MHZ 0x00000002
|
||||
#define CLOCK_CONTROL_50MHZ 0x0000000a
|
||||
#define CLOCK_CONTROL_60MHZ 0x00000008
|
||||
#define CLOCK_CONTROL_62_5MHZ 0x0000000c
|
||||
#define CLOCK_CONTROL_OFF 0x00000000
|
||||
|
||||
#define PCI_CTL_CLOCK_DLY_ADDR 0x000000b0
|
||||
#define PCI_CTL_CLOCK_DLY_MASK_A 0x00000f00
|
||||
#define PCI_CTL_CLOCK_DLY_MASK_B 0x0000f000
|
||||
|
||||
enum {
|
||||
CMD_READY = 0x01,
|
||||
FIFO_READY = 0x02,
|
||||
|
|
@ -367,8 +374,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
|
|||
return host->req->error;
|
||||
}
|
||||
|
||||
dev_dbg(&msh->dev, "control %08x\n",
|
||||
readl(host->addr + HOST_CONTROL));
|
||||
dev_dbg(&msh->dev, "control %08x\n", readl(host->addr + HOST_CONTROL));
|
||||
dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS));
|
||||
dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS));
|
||||
|
||||
|
|
@ -637,7 +643,7 @@ static int jmb38x_ms_reset(struct jmb38x_ms_host *host)
|
|||
ndelay(20);
|
||||
}
|
||||
dev_dbg(&host->chip->pdev->dev, "reset_req timeout\n");
|
||||
return -EIO;
|
||||
/* return -EIO; */
|
||||
|
||||
reset_next:
|
||||
writel(HOST_CONTROL_RESET | HOST_CONTROL_CLOCK_EN
|
||||
|
|
@ -680,7 +686,9 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,
|
|||
|
||||
host_ctl = 7;
|
||||
host_ctl |= HOST_CONTROL_POWER_EN
|
||||
| HOST_CONTROL_CLOCK_EN;
|
||||
| HOST_CONTROL_CLOCK_EN
|
||||
| HOST_CONTROL_HW_OC_P
|
||||
| HOST_CONTROL_TDELAY_EN;
|
||||
writel(host_ctl, host->addr + HOST_CONTROL);
|
||||
|
||||
writel(host->id ? PAD_PU_PD_ON_MS_SOCK1
|
||||
|
|
@ -704,33 +712,40 @@ static int jmb38x_ms_set_param(struct memstick_host *msh,
|
|||
break;
|
||||
case MEMSTICK_INTERFACE:
|
||||
host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);
|
||||
pci_read_config_dword(host->chip->pdev,
|
||||
PCI_CTL_CLOCK_DLY_ADDR,
|
||||
&clock_delay);
|
||||
clock_delay &= host->id ? ~PCI_CTL_CLOCK_DLY_MASK_B
|
||||
: ~PCI_CTL_CLOCK_DLY_MASK_A;
|
||||
|
||||
if (value == MEMSTICK_SERIAL) {
|
||||
host_ctl &= ~HOST_CONTROL_FAST_CLK;
|
||||
host_ctl &= ~HOST_CONTROL_REO;
|
||||
host_ctl |= HOST_CONTROL_IF_SERIAL
|
||||
<< HOST_CONTROL_IF_SHIFT;
|
||||
host_ctl |= HOST_CONTROL_REI;
|
||||
clock_ctl = CLOCK_CONTROL_40MHZ;
|
||||
clock_delay = 0;
|
||||
} else if (value == MEMSTICK_PAR4) {
|
||||
host_ctl |= HOST_CONTROL_FAST_CLK;
|
||||
host_ctl |= HOST_CONTROL_FAST_CLK | HOST_CONTROL_REO;
|
||||
host_ctl |= HOST_CONTROL_IF_PAR4
|
||||
<< HOST_CONTROL_IF_SHIFT;
|
||||
host_ctl &= ~HOST_CONTROL_REI;
|
||||
clock_ctl = CLOCK_CONTROL_40MHZ;
|
||||
clock_delay = 4;
|
||||
clock_delay |= host->id ? (4 << 12) : (4 << 8);
|
||||
} else if (value == MEMSTICK_PAR8) {
|
||||
host_ctl |= HOST_CONTROL_FAST_CLK;
|
||||
host_ctl |= HOST_CONTROL_IF_PAR8
|
||||
<< HOST_CONTROL_IF_SHIFT;
|
||||
host_ctl &= ~HOST_CONTROL_REI;
|
||||
clock_ctl = CLOCK_CONTROL_60MHZ;
|
||||
clock_delay = 0;
|
||||
host_ctl &= ~(HOST_CONTROL_REI | HOST_CONTROL_REO);
|
||||
clock_ctl = CLOCK_CONTROL_50MHZ;
|
||||
} else
|
||||
return -EINVAL;
|
||||
|
||||
writel(host_ctl, host->addr + HOST_CONTROL);
|
||||
writel(clock_ctl, host->addr + CLOCK_CONTROL);
|
||||
writel(clock_delay, host->addr + CLOCK_DELAY);
|
||||
pci_write_config_dword(host->chip->pdev,
|
||||
PCI_CTL_CLOCK_DLY_ADDR,
|
||||
clock_delay);
|
||||
break;
|
||||
};
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -445,6 +445,9 @@ static void __exit gru_exit(void)
|
|||
int order = get_order(sizeof(struct gru_state) *
|
||||
GRU_CHIPLETS_PER_BLADE);
|
||||
|
||||
if (!IS_UV())
|
||||
return;
|
||||
|
||||
for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
|
||||
free_irq(IRQ_GRU + i, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ static int __init do_hpp_probe(struct net_device *dev)
|
|||
#ifndef MODULE
|
||||
struct net_device * __init hp_plus_probe(int unit)
|
||||
{
|
||||
struct net_device *dev = alloc_ei_netdev();
|
||||
struct net_device *dev = alloc_eip_netdev();
|
||||
int err;
|
||||
|
||||
if (!dev)
|
||||
|
|
@ -284,7 +284,7 @@ hpp_open(struct net_device *dev)
|
|||
int option_reg;
|
||||
int retval;
|
||||
|
||||
if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
|
||||
if ((retval = request_irq(dev->irq, eip_interrupt, 0, dev->name, dev))) {
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -302,7 +302,7 @@ hpp_open(struct net_device *dev)
|
|||
/* Select the operational page. */
|
||||
outw(Perf_Page, ioaddr + HP_PAGING);
|
||||
|
||||
ei_open(dev);
|
||||
eip_open(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -313,7 +313,7 @@ hpp_close(struct net_device *dev)
|
|||
int option_reg = inw(ioaddr + HPP_OPTION);
|
||||
|
||||
free_irq(dev->irq, dev);
|
||||
ei_close(dev);
|
||||
eip_close(dev);
|
||||
outw((option_reg & ~EnableIRQ) | MemDisable | NICReset | ChipReset,
|
||||
ioaddr + HPP_OPTION);
|
||||
|
||||
|
|
|
|||
|
|
@ -5984,6 +5984,56 @@ static void niu_netif_start(struct niu *np)
|
|||
niu_enable_interrupts(np, 1);
|
||||
}
|
||||
|
||||
static void niu_reset_buffers(struct niu *np)
|
||||
{
|
||||
int i, j, k, err;
|
||||
|
||||
if (np->rx_rings) {
|
||||
for (i = 0; i < np->num_rx_rings; i++) {
|
||||
struct rx_ring_info *rp = &np->rx_rings[i];
|
||||
|
||||
for (j = 0, k = 0; j < MAX_RBR_RING_SIZE; j++) {
|
||||
struct page *page;
|
||||
|
||||
page = rp->rxhash[j];
|
||||
while (page) {
|
||||
struct page *next =
|
||||
(struct page *) page->mapping;
|
||||
u64 base = page->index;
|
||||
base = base >> RBR_DESCR_ADDR_SHIFT;
|
||||
rp->rbr[k++] = cpu_to_le32(base);
|
||||
page = next;
|
||||
}
|
||||
}
|
||||
for (; k < MAX_RBR_RING_SIZE; k++) {
|
||||
err = niu_rbr_add_page(np, rp, GFP_ATOMIC, k);
|
||||
if (unlikely(err))
|
||||
break;
|
||||
}
|
||||
|
||||
rp->rbr_index = rp->rbr_table_size - 1;
|
||||
rp->rcr_index = 0;
|
||||
rp->rbr_pending = 0;
|
||||
rp->rbr_refill_pending = 0;
|
||||
}
|
||||
}
|
||||
if (np->tx_rings) {
|
||||
for (i = 0; i < np->num_tx_rings; i++) {
|
||||
struct tx_ring_info *rp = &np->tx_rings[i];
|
||||
|
||||
for (j = 0; j < MAX_TX_RING_SIZE; j++) {
|
||||
if (rp->tx_buffs[j].skb)
|
||||
(void) release_tx_packet(np, rp, j);
|
||||
}
|
||||
|
||||
rp->pending = MAX_TX_RING_SIZE;
|
||||
rp->prod = 0;
|
||||
rp->cons = 0;
|
||||
rp->wrap_bit = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void niu_reset_task(struct work_struct *work)
|
||||
{
|
||||
struct niu *np = container_of(work, struct niu, reset_task);
|
||||
|
|
@ -6006,6 +6056,12 @@ static void niu_reset_task(struct work_struct *work)
|
|||
|
||||
niu_stop_hw(np);
|
||||
|
||||
spin_unlock_irqrestore(&np->lock, flags);
|
||||
|
||||
niu_reset_buffers(np);
|
||||
|
||||
spin_lock_irqsave(&np->lock, flags);
|
||||
|
||||
err = niu_init_hw(np);
|
||||
if (!err) {
|
||||
np->timer.expires = jiffies + HZ;
|
||||
|
|
|
|||
|
|
@ -209,6 +209,7 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
|
|||
unsigned int curlen;
|
||||
struct ath_txq *cabq;
|
||||
struct ath_txq *mcastq;
|
||||
struct ieee80211_tx_info *info;
|
||||
avp = sc->sc_vaps[if_id];
|
||||
|
||||
mcastq = &avp->av_mcastq;
|
||||
|
|
@ -232,6 +233,18 @@ static struct ath_buf *ath_beacon_generate(struct ath_softc *sc, int if_id)
|
|||
*/
|
||||
curlen = skb->len;
|
||||
|
||||
info = IEEE80211_SKB_CB(skb);
|
||||
if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
|
||||
/*
|
||||
* TODO: make sure the seq# gets assigned properly (vs. other
|
||||
* TX frames)
|
||||
*/
|
||||
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
|
||||
sc->seq_no += 0x10;
|
||||
hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
|
||||
hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);
|
||||
}
|
||||
|
||||
/* XXX: spin_lock_bh should not be used here, but sparse bitches
|
||||
* otherwise. We should fix sparse :) */
|
||||
spin_lock_bh(&mcastq->axq_lock);
|
||||
|
|
|
|||
|
|
@ -992,6 +992,7 @@ struct ath_softc {
|
|||
u32 sc_txintrperiod; /* tx interrupt batching */
|
||||
int sc_haltype2q[ATH9K_WME_AC_VO+1]; /* HAL WME AC -> h/w qnum */
|
||||
u32 sc_ant_tx[8]; /* recent tx frames/antenna */
|
||||
u16 seq_no; /* TX sequence number */
|
||||
|
||||
/* Beacon */
|
||||
struct ath9k_tx_queue_info sc_beacon_qi;
|
||||
|
|
|
|||
|
|
@ -369,6 +369,20 @@ static int ath9k_tx(struct ieee80211_hw *hw,
|
|||
{
|
||||
struct ath_softc *sc = hw->priv;
|
||||
int hdrlen, padsize;
|
||||
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
||||
|
||||
/*
|
||||
* As a temporary workaround, assign seq# here; this will likely need
|
||||
* to be cleaned up to work better with Beacon transmission and virtual
|
||||
* BSSes.
|
||||
*/
|
||||
if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
|
||||
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
|
||||
if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
|
||||
sc->seq_no += 0x10;
|
||||
hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
|
||||
hdr->seq_ctrl |= cpu_to_le16(sc->seq_no);
|
||||
}
|
||||
|
||||
/* Add the padding after the header if this is not already done */
|
||||
hdrlen = ieee80211_get_hdrlen_from_skb(skb);
|
||||
|
|
|
|||
|
|
@ -43,23 +43,6 @@ static bool b43_is_hw_radio_enabled(struct b43_wldev *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Update the rfkill state */
|
||||
static void b43_rfkill_update_state(struct b43_wldev *dev)
|
||||
{
|
||||
struct b43_rfkill *rfk = &(dev->wl->rfkill);
|
||||
|
||||
if (!dev->radio_hw_enable) {
|
||||
rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!dev->phy.radio_on)
|
||||
rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
|
||||
else
|
||||
rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
|
||||
|
||||
}
|
||||
|
||||
/* The poll callback for the hardware button. */
|
||||
static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
|
||||
{
|
||||
|
|
@ -77,7 +60,6 @@ static void b43_rfkill_poll(struct input_polled_dev *poll_dev)
|
|||
if (unlikely(enabled != dev->radio_hw_enable)) {
|
||||
dev->radio_hw_enable = enabled;
|
||||
report_change = 1;
|
||||
b43_rfkill_update_state(dev);
|
||||
b43info(wl, "Radio hardware status changed to %s\n",
|
||||
enabled ? "ENABLED" : "DISABLED");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,23 +44,6 @@ static bool b43legacy_is_hw_radio_enabled(struct b43legacy_wldev *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Update the rfkill state */
|
||||
static void b43legacy_rfkill_update_state(struct b43legacy_wldev *dev)
|
||||
{
|
||||
struct b43legacy_rfkill *rfk = &(dev->wl->rfkill);
|
||||
|
||||
if (!dev->radio_hw_enable) {
|
||||
rfk->rfkill->state = RFKILL_STATE_HARD_BLOCKED;
|
||||
return;
|
||||
}
|
||||
|
||||
if (!dev->phy.radio_on)
|
||||
rfk->rfkill->state = RFKILL_STATE_SOFT_BLOCKED;
|
||||
else
|
||||
rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
|
||||
|
||||
}
|
||||
|
||||
/* The poll callback for the hardware button. */
|
||||
static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
|
||||
{
|
||||
|
|
@ -78,7 +61,6 @@ static void b43legacy_rfkill_poll(struct input_polled_dev *poll_dev)
|
|||
if (unlikely(enabled != dev->radio_hw_enable)) {
|
||||
dev->radio_hw_enable = enabled;
|
||||
report_change = 1;
|
||||
b43legacy_rfkill_update_state(dev);
|
||||
b43legacyinfo(wl, "Radio hardware status changed to %s\n",
|
||||
enabled ? "ENABLED" : "DISABLED");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -320,15 +320,15 @@ static int disable_slot(struct hotplug_slot *slot)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
/* remove the device from the pci core */
|
||||
pci_remove_bus_device(dev);
|
||||
|
||||
/* queue work item to blow away this sysfs entry and other
|
||||
* parts.
|
||||
*/
|
||||
INIT_WORK(&dslot->remove_work, remove_slot_worker);
|
||||
queue_work(dummyphp_wq, &dslot->remove_work);
|
||||
|
||||
/* blow away this sysfs entry and other parts. */
|
||||
remove_slot(dslot);
|
||||
|
||||
pci_dev_put(dev);
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ static int pcie_poll_cmd(struct controller *ctrl)
|
|||
return 1;
|
||||
}
|
||||
}
|
||||
while (timeout > 1000) {
|
||||
while (timeout > 0) {
|
||||
msleep(10);
|
||||
timeout -= 10;
|
||||
if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
|
||||
|
|
|
|||
|
|
@ -2348,11 +2348,34 @@ static void __init iommu_exit_mempool(void)
|
|||
|
||||
}
|
||||
|
||||
static int blacklist_iommu(const struct dmi_system_id *id)
|
||||
{
|
||||
printk(KERN_INFO "%s detected; disabling IOMMU\n",
|
||||
id->ident);
|
||||
dmar_disabled = 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct dmi_system_id __initdata intel_iommu_dmi_table[] = {
|
||||
{ /* Some DG33BU BIOS revisions advertised non-existent VT-d */
|
||||
.callback = blacklist_iommu,
|
||||
.ident = "Intel DG33BU",
|
||||
{ DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"),
|
||||
DMI_MATCH(DMI_BOARD_NAME, "DG33BU"),
|
||||
}
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
||||
void __init detect_intel_iommu(void)
|
||||
{
|
||||
if (swiotlb || no_iommu || iommu_detected || dmar_disabled)
|
||||
return;
|
||||
if (early_dmar_detect()) {
|
||||
dmi_check_system(intel_iommu_dmi_table);
|
||||
if (dmar_disabled)
|
||||
return;
|
||||
iommu_detected = 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -304,6 +304,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
|
|||
} else {
|
||||
res->start = l64;
|
||||
res->end = l64 + sz64;
|
||||
printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
|
||||
pci_name(dev), pos, (unsigned long long)res->start,
|
||||
(unsigned long long)res->end);
|
||||
}
|
||||
} else {
|
||||
sz = pci_size(l, sz, mask);
|
||||
|
|
@ -313,6 +316,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
|
|||
|
||||
res->start = l;
|
||||
res->end = l + sz;
|
||||
printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
|
||||
pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
|
||||
(unsigned long long)res->start, (unsigned long long)res->end);
|
||||
}
|
||||
|
||||
out:
|
||||
|
|
@ -383,7 +389,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
|
|||
res->start = base;
|
||||
if (!res->end)
|
||||
res->end = limit + 0xfff;
|
||||
printk(KERN_INFO "PCI: bridge %s io port: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
|
||||
printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
|
||||
pci_name(dev), (unsigned long long) res->start,
|
||||
(unsigned long long) res->end);
|
||||
}
|
||||
|
||||
res = child->resource[1];
|
||||
|
|
@ -395,7 +403,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
|
|||
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
|
||||
res->start = base;
|
||||
res->end = limit + 0xfffff;
|
||||
printk(KERN_INFO "PCI: bridge %s 32bit mmio: [%llx, %llx]\n", pci_name(dev), res->start, res->end);
|
||||
printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
|
||||
pci_name(dev), (unsigned long long) res->start,
|
||||
(unsigned long long) res->end);
|
||||
}
|
||||
|
||||
res = child->resource[2];
|
||||
|
|
@ -431,7 +441,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
|
|||
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
|
||||
res->start = base;
|
||||
res->end = limit + 0xfffff;
|
||||
printk(KERN_INFO "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n", pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64)?"64":"32",res->start, res->end);
|
||||
printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
|
||||
pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
|
||||
(unsigned long long) res->start, (unsigned long long) res->end);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -540,7 +540,11 @@ static void pci_bus_dump_res(struct pci_bus *bus)
|
|||
if (!res)
|
||||
continue;
|
||||
|
||||
printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n", bus->number, i, (res->flags & IORESOURCE_IO)? "io port":"mmio", res->start, res->end);
|
||||
printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n",
|
||||
bus->number, i,
|
||||
(res->flags & IORESOURCE_IO) ? "io port" : "mmio",
|
||||
(unsigned long long) res->start,
|
||||
(unsigned long long) res->end);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -748,7 +748,9 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
|
|||
|
||||
add_timer(&skt->poll_timer);
|
||||
|
||||
device_create_file(&skt->socket.dev, &dev_attr_status);
|
||||
ret = device_create_file(&skt->socket.dev, &dev_attr_status);
|
||||
if (ret)
|
||||
goto out_err_8;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, sinfo);
|
||||
|
|
@ -758,6 +760,8 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
|
|||
do {
|
||||
skt = &sinfo->skt[i];
|
||||
|
||||
device_remove_file(&skt->socket.dev, &dev_attr_status);
|
||||
out_err_8:
|
||||
del_timer_sync(&skt->poll_timer);
|
||||
pcmcia_unregister_socket(&skt->socket);
|
||||
|
||||
|
|
|
|||
|
|
@ -152,10 +152,8 @@ static int zfcp_ccw_set_offline(struct ccw_device *ccw_device)
|
|||
*/
|
||||
static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
|
||||
{
|
||||
struct zfcp_adapter *adapter;
|
||||
struct zfcp_adapter *adapter = dev_get_drvdata(&ccw_device->dev);
|
||||
|
||||
down(&zfcp_data.config_sema);
|
||||
adapter = dev_get_drvdata(&ccw_device->dev);
|
||||
switch (event) {
|
||||
case CIO_GONE:
|
||||
dev_warn(&adapter->ccw_device->dev, "device gone\n");
|
||||
|
|
@ -174,8 +172,6 @@ static int zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
|
|||
89, NULL);
|
||||
break;
|
||||
}
|
||||
zfcp_erp_wait(adapter);
|
||||
up(&zfcp_data.config_sema);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,18 +39,6 @@ struct zfcp_gpn_ft {
|
|||
struct scatterlist sg_resp[ZFCP_GPN_FT_BUFFERS];
|
||||
};
|
||||
|
||||
static struct zfcp_port *zfcp_get_port_by_did(struct zfcp_adapter *adapter,
|
||||
u32 d_id)
|
||||
{
|
||||
struct zfcp_port *port;
|
||||
|
||||
list_for_each_entry(port, &adapter->port_list_head, list)
|
||||
if ((port->d_id == d_id) &&
|
||||
!atomic_test_mask(ZFCP_STATUS_COMMON_REMOVE, &port->status))
|
||||
return port;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
|
||||
struct fcp_rscn_element *elem)
|
||||
{
|
||||
|
|
@ -341,12 +329,13 @@ void zfcp_test_link(struct zfcp_port *port)
|
|||
|
||||
zfcp_port_get(port);
|
||||
retval = zfcp_fc_adisc(port);
|
||||
if (retval == 0 || retval == -EBUSY)
|
||||
if (retval == 0)
|
||||
return;
|
||||
|
||||
/* send of ADISC was not possible */
|
||||
zfcp_port_put(port);
|
||||
zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
|
||||
if (retval != -EBUSY)
|
||||
zfcp_erp_port_forced_reopen(port, 0, 65, NULL);
|
||||
}
|
||||
|
||||
static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
|
||||
|
|
@ -363,7 +352,6 @@ static int zfcp_scan_get_nameserver(struct zfcp_adapter *adapter)
|
|||
if (ret)
|
||||
return ret;
|
||||
zfcp_erp_wait(adapter);
|
||||
zfcp_port_put(adapter->nameserver_port);
|
||||
}
|
||||
return !atomic_test_mask(ZFCP_STATUS_COMMON_UNBLOCKED,
|
||||
&adapter->nameserver_port->status);
|
||||
|
|
@ -475,7 +463,7 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
|
|||
struct zfcp_adapter *adapter = ct->port->adapter;
|
||||
struct zfcp_port *port, *tmp;
|
||||
u32 d_id;
|
||||
int ret = 0, x;
|
||||
int ret = 0, x, last = 0;
|
||||
|
||||
if (ct->status)
|
||||
return -EIO;
|
||||
|
|
@ -492,19 +480,24 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
|
|||
down(&zfcp_data.config_sema);
|
||||
|
||||
/* first entry is the header */
|
||||
for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES; x++) {
|
||||
for (x = 1; x < ZFCP_GPN_FT_MAX_ENTRIES && !last; x++) {
|
||||
if (x % (ZFCP_GPN_FT_ENTRIES + 1))
|
||||
acc++;
|
||||
else
|
||||
acc = sg_virt(++sg);
|
||||
|
||||
last = acc->control & 0x80;
|
||||
d_id = acc->port_id[0] << 16 | acc->port_id[1] << 8 |
|
||||
acc->port_id[2];
|
||||
|
||||
/* skip the adapter's port and known remote ports */
|
||||
if (acc->wwpn == fc_host_port_name(adapter->scsi_host) ||
|
||||
zfcp_get_port_by_did(adapter, d_id))
|
||||
if (acc->wwpn == fc_host_port_name(adapter->scsi_host))
|
||||
continue;
|
||||
port = zfcp_get_port_by_wwpn(adapter, acc->wwpn);
|
||||
if (port) {
|
||||
zfcp_port_get(port);
|
||||
continue;
|
||||
}
|
||||
|
||||
port = zfcp_port_enqueue(adapter, acc->wwpn,
|
||||
ZFCP_STATUS_PORT_DID_DID |
|
||||
|
|
@ -513,8 +506,6 @@ static int zfcp_scan_eval_gpn_ft(struct zfcp_gpn_ft *gpn_ft)
|
|||
ret = PTR_ERR(port);
|
||||
else
|
||||
zfcp_erp_port_reopen(port, 0, 149, NULL);
|
||||
if (acc->control & 0x80) /* last entry */
|
||||
break;
|
||||
}
|
||||
|
||||
zfcp_erp_wait(adapter);
|
||||
|
|
|
|||
|
|
@ -710,10 +710,10 @@ static void zfcp_fsf_exchange_port_data_handler(struct zfcp_fsf_req *req)
|
|||
|
||||
static int zfcp_fsf_sbal_check(struct zfcp_qdio_queue *queue)
|
||||
{
|
||||
spin_lock(&queue->lock);
|
||||
spin_lock_bh(&queue->lock);
|
||||
if (atomic_read(&queue->count))
|
||||
return 1;
|
||||
spin_unlock(&queue->lock);
|
||||
spin_unlock_bh(&queue->lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -722,13 +722,13 @@ static int zfcp_fsf_req_sbal_get(struct zfcp_adapter *adapter)
|
|||
long ret;
|
||||
struct zfcp_qdio_queue *req_q = &adapter->req_q;
|
||||
|
||||
spin_unlock(&req_q->lock);
|
||||
spin_unlock_bh(&req_q->lock);
|
||||
ret = wait_event_interruptible_timeout(adapter->request_wq,
|
||||
zfcp_fsf_sbal_check(req_q), 5 * HZ);
|
||||
if (ret > 0)
|
||||
return 0;
|
||||
|
||||
spin_lock(&req_q->lock);
|
||||
spin_lock_bh(&req_q->lock);
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
|
@ -870,14 +870,14 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter)
|
|||
volatile struct qdio_buffer_element *sbale;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS,
|
||||
ZFCP_REQ_NO_QTCB,
|
||||
adapter->pool.fsf_req_status_read);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -910,7 +910,7 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter)
|
|||
zfcp_fsf_req_free(req);
|
||||
zfcp_hba_dbf_event_fsf_unsol("fail", adapter, NULL);
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -988,7 +988,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id,
|
|||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,
|
||||
req_flags, adapter->pool.fsf_req_abort);
|
||||
if (unlikely(IS_ERR(req)))
|
||||
if (IS_ERR(req))
|
||||
goto out;
|
||||
|
||||
if (unlikely(!(atomic_read(&unit->status) &
|
||||
|
|
@ -1106,13 +1106,13 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,
|
|||
struct zfcp_fsf_req *req;
|
||||
int ret = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC,
|
||||
ZFCP_REQ_AUTO_CLEANUP, pool);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
ret = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1148,7 +1148,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool,
|
|||
if (erp_action)
|
||||
erp_action->fsf_req = NULL;
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -1223,7 +1223,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
|
|||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,
|
||||
ZFCP_REQ_AUTO_CLEANUP, NULL);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
ret = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1263,14 +1263,14 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_adapter *adapter = erp_action->adapter;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (!atomic_read(&adapter->req_q.count))
|
||||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter,
|
||||
FSF_QTCB_EXCHANGE_CONFIG_DATA,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1295,7 +1295,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1306,13 +1306,13 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
|
|||
struct zfcp_fsf_req *req = NULL;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA,
|
||||
0, NULL);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1334,7 +1334,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter,
|
|||
zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
|
||||
retval = zfcp_fsf_req_send(req);
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
if (!retval)
|
||||
wait_event(req->completion_wq,
|
||||
req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
|
||||
|
|
@ -1359,13 +1359,13 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
|
|||
if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (!atomic_read(&adapter->req_q.count))
|
||||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1385,7 +1385,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1405,13 +1405,13 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
|
|||
if (!(adapter->adapter_features & FSF_FEATURE_HBAAPI_MANAGEMENT))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (!atomic_read(&adapter->req_q.count))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0,
|
||||
NULL);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1427,7 +1427,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter,
|
|||
zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
|
||||
retval = zfcp_fsf_req_send(req);
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
if (!retval)
|
||||
wait_event(req->completion_wq,
|
||||
req->status & ZFCP_STATUS_FSFREQ_COMPLETED);
|
||||
|
|
@ -1531,7 +1531,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_fsf_req *req;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
|
|
@ -1539,7 +1539,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
|
|||
FSF_QTCB_OPEN_PORT_WITH_DID,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1562,7 +1562,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1603,14 +1603,14 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_fsf_req *req;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1633,7 +1633,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1700,14 +1700,14 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_fsf_req *req;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1731,7 +1731,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1875,14 +1875,14 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_fsf_req *req;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1910,7 +1910,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -1965,13 +1965,13 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
|
|||
struct zfcp_fsf_req *req;
|
||||
int retval = -EIO;
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN,
|
||||
ZFCP_REQ_AUTO_CLEANUP,
|
||||
adapter->pool.fsf_req_erp);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -1995,7 +1995,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action)
|
|||
erp_action->fsf_req = NULL;
|
||||
}
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -2228,7 +2228,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter,
|
|||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
|
||||
adapter->pool.fsf_req_scsi);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = PTR_ERR(req);
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -2351,7 +2351,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter,
|
|||
goto out;
|
||||
req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,
|
||||
adapter->pool.fsf_req_scsi);
|
||||
if (unlikely(IS_ERR(req)))
|
||||
if (IS_ERR(req))
|
||||
goto out;
|
||||
|
||||
req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
|
||||
|
|
@ -2417,12 +2417,12 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
|
|||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
spin_lock(&adapter->req_q.lock);
|
||||
spin_lock_bh(&adapter->req_q.lock);
|
||||
if (zfcp_fsf_req_sbal_get(adapter))
|
||||
goto out;
|
||||
|
||||
req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL);
|
||||
if (unlikely(IS_ERR(req))) {
|
||||
if (IS_ERR(req)) {
|
||||
retval = -EPERM;
|
||||
goto out;
|
||||
}
|
||||
|
|
@ -2447,7 +2447,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter,
|
|||
zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
|
||||
retval = zfcp_fsf_req_send(req);
|
||||
out:
|
||||
spin_unlock(&adapter->req_q.lock);
|
||||
spin_unlock_bh(&adapter->req_q.lock);
|
||||
|
||||
if (!retval) {
|
||||
wait_event(req->completion_wq,
|
||||
|
|
|
|||
|
|
@ -423,9 +423,9 @@ void zfcp_qdio_close(struct zfcp_adapter *adapter)
|
|||
|
||||
/* clear QDIOUP flag, thus do_QDIO is not called during qdio_shutdown */
|
||||
req_q = &adapter->req_q;
|
||||
spin_lock(&req_q->lock);
|
||||
spin_lock_bh(&req_q->lock);
|
||||
atomic_clear_mask(ZFCP_STATUS_ADAPTER_QDIOUP, &adapter->status);
|
||||
spin_unlock(&req_q->lock);
|
||||
spin_unlock_bh(&req_q->lock);
|
||||
|
||||
qdio_shutdown(adapter->ccw_device, QDIO_FLAG_CLEANUP_USING_CLEAR);
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ comment "SCSI support type (disk, tape, CD-ROM)"
|
|||
config BLK_DEV_SD
|
||||
tristate "SCSI disk support"
|
||||
depends on SCSI
|
||||
select CRC_T10DIF
|
||||
select CRC_T10DIF if BLK_DEV_INTEGRITY
|
||||
---help---
|
||||
If you want to use SCSI hard disks, Fibre Channel disks,
|
||||
Serial ATA (SATA) or Parallel ATA (PATA) hard disks,
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@ static int alua_check_sense(struct scsi_device *sdev,
|
|||
/*
|
||||
* LUN Not Accessible - ALUA state transition
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
if (sense_hdr->asc == 0x04 && sense_hdr->ascq == 0x0b)
|
||||
/*
|
||||
* LUN Not Accessible -- Target port in standby state
|
||||
|
|
@ -447,18 +447,18 @@ static int alua_check_sense(struct scsi_device *sdev,
|
|||
/*
|
||||
* Power On, Reset, or Bus Device Reset, just retry.
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x06) {
|
||||
/*
|
||||
* ALUA state changed
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
}
|
||||
if (sense_hdr->asc == 0x2a && sense_hdr->ascq == 0x07) {
|
||||
/*
|
||||
* Implicit ALUA state transition failed
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -490,7 +490,7 @@ static int alua_stpg(struct scsi_device *sdev, int state,
|
|||
if (!err)
|
||||
return SCSI_DH_IO;
|
||||
err = alua_check_sense(sdev, &sense_hdr);
|
||||
if (retry > 0 && err == NEEDS_RETRY) {
|
||||
if (retry > 0 && err == ADD_TO_MLQUEUE) {
|
||||
retry--;
|
||||
goto retry;
|
||||
}
|
||||
|
|
@ -535,7 +535,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_dh_data *h)
|
|||
return SCSI_DH_IO;
|
||||
|
||||
err = alua_check_sense(sdev, &sense_hdr);
|
||||
if (err == NEEDS_RETRY)
|
||||
if (err == ADD_TO_MLQUEUE)
|
||||
goto retry;
|
||||
sdev_printk(KERN_INFO, sdev,
|
||||
"%s: rtpg sense code %02x/%02x/%02x\n",
|
||||
|
|
|
|||
|
|
@ -439,7 +439,7 @@ static int clariion_check_sense(struct scsi_device *sdev,
|
|||
* Unit Attention Code. This is the first IO
|
||||
* to the new path, so just retry.
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -514,7 +514,7 @@ static int clariion_send_inquiry(struct scsi_device *sdev,
|
|||
return SCSI_DH_IO;
|
||||
|
||||
err = clariion_check_sense(sdev, &sshdr);
|
||||
if (retry > 0 && err == NEEDS_RETRY) {
|
||||
if (retry > 0 && err == ADD_TO_MLQUEUE) {
|
||||
retry--;
|
||||
goto retry;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -551,7 +551,7 @@ static int rdac_check_sense(struct scsi_device *sdev,
|
|||
*
|
||||
* Just retry and wait.
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
break;
|
||||
case ILLEGAL_REQUEST:
|
||||
if (sense_hdr->asc == 0x94 && sense_hdr->ascq == 0x01) {
|
||||
|
|
@ -568,7 +568,7 @@ static int rdac_check_sense(struct scsi_device *sdev,
|
|||
/*
|
||||
* Power On, Reset, or Bus Device Reset, just retry.
|
||||
*/
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
break;
|
||||
}
|
||||
/* success just means we do not care what scsi-ml does */
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ static int scsi_check_sense(struct scsi_cmnd *scmd)
|
|||
|
||||
case HARDWARE_ERROR:
|
||||
if (scmd->device->retry_hwerror)
|
||||
return NEEDS_RETRY;
|
||||
return ADD_TO_MLQUEUE;
|
||||
else
|
||||
return SUCCESS;
|
||||
|
||||
|
|
|
|||
|
|
@ -1080,7 +1080,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
|
|||
* PDT=1Fh none (no FDD connected to the requested logical unit)
|
||||
*/
|
||||
if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) &&
|
||||
(result[0] & 0x1f) == 0x1f) {
|
||||
(result[0] & 0x1f) == 0x1f &&
|
||||
!scsi_is_wlun(lun)) {
|
||||
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
|
||||
"scsi scan: peripheral device type"
|
||||
" of 31, no device added\n"));
|
||||
|
|
|
|||
|
|
@ -1875,7 +1875,6 @@ static int sd_probe(struct device *dev)
|
|||
|
||||
dev_set_drvdata(dev, sdkp);
|
||||
add_disk(gd);
|
||||
blk_register_filter(gd);
|
||||
sd_dif_config_host(sdkp);
|
||||
|
||||
sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
|
||||
|
|
@ -1909,7 +1908,6 @@ static int sd_remove(struct device *dev)
|
|||
struct scsi_disk *sdkp = dev_get_drvdata(dev);
|
||||
|
||||
device_del(&sdkp->dev);
|
||||
blk_unregister_filter(sdkp->disk);
|
||||
del_gendisk(sdkp->disk);
|
||||
sd_shutdown(dev);
|
||||
|
||||
|
|
|
|||
|
|
@ -656,7 +656,6 @@ static int sr_probe(struct device *dev)
|
|||
dev_set_drvdata(dev, cd);
|
||||
disk->flags |= GENHD_FL_REMOVABLE;
|
||||
add_disk(disk);
|
||||
blk_register_filter(disk);
|
||||
|
||||
sdev_printk(KERN_DEBUG, sdev,
|
||||
"Attached scsi CD-ROM %s\n", cd->cdi.name);
|
||||
|
|
@ -895,7 +894,6 @@ static int sr_remove(struct device *dev)
|
|||
{
|
||||
struct scsi_cd *cd = dev_get_drvdata(dev);
|
||||
|
||||
blk_unregister_filter(cd->disk);
|
||||
del_gendisk(cd->disk);
|
||||
|
||||
mutex_lock(&sr_ref_mutex);
|
||||
|
|
|
|||
|
|
@ -127,8 +127,13 @@
|
|||
#define UCR3_RXDSEN (1<<6) /* Receive status interrupt enable */
|
||||
#define UCR3_AIRINTEN (1<<5) /* Async IR wake interrupt enable */
|
||||
#define UCR3_AWAKEN (1<<4) /* Async wake interrupt enable */
|
||||
#define UCR3_REF25 (1<<3) /* Ref freq 25 MHz */
|
||||
#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz */
|
||||
#ifdef CONFIG_ARCH_IMX
|
||||
#define UCR3_REF25 (1<<3) /* Ref freq 25 MHz, only on mx1 */
|
||||
#define UCR3_REF30 (1<<2) /* Ref Freq 30 MHz, only on mx1 */
|
||||
#endif
|
||||
#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
|
||||
#define UCR3_RXDMUXSEL (1<<2) /* RXD Muxed Input Select, on mx2/mx3 */
|
||||
#endif
|
||||
#define UCR3_INVT (1<<1) /* Inverted Infrared transmission */
|
||||
#define UCR3_BPEN (1<<0) /* Preset registers enable */
|
||||
#define UCR4_CTSTL_32 (32<<10) /* CTS trigger level (32 chars) */
|
||||
|
|
@ -445,7 +450,7 @@ static irqreturn_t imx_int(int irq, void *dev_id)
|
|||
readl(sport->port.membase + UCR1) & UCR1_TXMPTYEN)
|
||||
imx_txint(irq, dev_id);
|
||||
|
||||
if (sts & USR1_RTSS)
|
||||
if (sts & USR1_RTSD)
|
||||
imx_rtsint(irq, dev_id);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
|
|
@ -598,6 +603,12 @@ static int imx_startup(struct uart_port *port)
|
|||
temp |= (UCR2_RXEN | UCR2_TXEN);
|
||||
writel(temp, sport->port.membase + UCR2);
|
||||
|
||||
#if defined CONFIG_ARCH_MX2 || defined CONFIG_ARCH_MX3
|
||||
temp = readl(sport->port.membase + UCR3);
|
||||
temp |= UCR3_RXDMUXSEL;
|
||||
writel(temp, sport->port.membase + UCR3);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Enable modem status interrupts
|
||||
*/
|
||||
|
|
@ -1133,13 +1144,19 @@ static int serial_imx_probe(struct platform_device *pdev)
|
|||
if(pdata && (pdata->flags & IMXUART_HAVE_RTSCTS))
|
||||
sport->have_rtscts = 1;
|
||||
|
||||
if (pdata->init)
|
||||
pdata->init(pdev);
|
||||
if (pdata->init) {
|
||||
ret = pdata->init(pdev);
|
||||
if (ret)
|
||||
goto clkput;
|
||||
}
|
||||
|
||||
uart_add_one_port(&imx_reg, &sport->port);
|
||||
platform_set_drvdata(pdev, &sport->port);
|
||||
|
||||
return 0;
|
||||
clkput:
|
||||
clk_put(sport->clk);
|
||||
clk_disable(sport->clk);
|
||||
unmap:
|
||||
iounmap(sport->port.membase);
|
||||
free:
|
||||
|
|
|
|||
|
|
@ -47,9 +47,10 @@ MODULE_ALIAS("platform:pxa2xx-spi");
|
|||
|
||||
#define MAX_BUSES 3
|
||||
|
||||
#define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
|
||||
#define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK)
|
||||
#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
|
||||
#define DMA_INT_MASK (DCSR_ENDINTR | DCSR_STARTINTR | DCSR_BUSERR)
|
||||
#define RESET_DMA_CHANNEL (DCSR_NODESC | DMA_INT_MASK)
|
||||
#define IS_DMA_ALIGNED(x) (((x) & 0x07) == 0)
|
||||
#define MAX_DMA_LEN 8191
|
||||
|
||||
/*
|
||||
* for testing SSCR1 changes that require SSP restart, basically
|
||||
|
|
@ -144,7 +145,6 @@ struct driver_data {
|
|||
size_t tx_map_len;
|
||||
u8 n_bytes;
|
||||
u32 dma_width;
|
||||
int cs_change;
|
||||
int (*write)(struct driver_data *drv_data);
|
||||
int (*read)(struct driver_data *drv_data);
|
||||
irqreturn_t (*transfer_handler)(struct driver_data *drv_data);
|
||||
|
|
@ -406,8 +406,45 @@ static void giveback(struct driver_data *drv_data)
|
|||
struct spi_transfer,
|
||||
transfer_list);
|
||||
|
||||
/* Delay if requested before any change in chip select */
|
||||
if (last_transfer->delay_usecs)
|
||||
udelay(last_transfer->delay_usecs);
|
||||
|
||||
/* Drop chip select UNLESS cs_change is true or we are returning
|
||||
* a message with an error, or next message is for another chip
|
||||
*/
|
||||
if (!last_transfer->cs_change)
|
||||
drv_data->cs_control(PXA2XX_CS_DEASSERT);
|
||||
else {
|
||||
struct spi_message *next_msg;
|
||||
|
||||
/* Holding of cs was hinted, but we need to make sure
|
||||
* the next message is for the same chip. Don't waste
|
||||
* time with the following tests unless this was hinted.
|
||||
*
|
||||
* We cannot postpone this until pump_messages, because
|
||||
* after calling msg->complete (below) the driver that
|
||||
* sent the current message could be unloaded, which
|
||||
* could invalidate the cs_control() callback...
|
||||
*/
|
||||
|
||||
/* get a pointer to the next message, if any */
|
||||
spin_lock_irqsave(&drv_data->lock, flags);
|
||||
if (list_empty(&drv_data->queue))
|
||||
next_msg = NULL;
|
||||
else
|
||||
next_msg = list_entry(drv_data->queue.next,
|
||||
struct spi_message, queue);
|
||||
spin_unlock_irqrestore(&drv_data->lock, flags);
|
||||
|
||||
/* see if the next and current messages point
|
||||
* to the same chip
|
||||
*/
|
||||
if (next_msg && next_msg->spi != msg->spi)
|
||||
next_msg = NULL;
|
||||
if (!next_msg || msg->state == ERROR_STATE)
|
||||
drv_data->cs_control(PXA2XX_CS_DEASSERT);
|
||||
}
|
||||
|
||||
msg->state = NULL;
|
||||
if (msg->complete)
|
||||
|
|
@ -490,10 +527,9 @@ static void dma_transfer_complete(struct driver_data *drv_data)
|
|||
msg->actual_length += drv_data->len -
|
||||
(drv_data->rx_end - drv_data->rx);
|
||||
|
||||
/* Release chip select if requested, transfer delays are
|
||||
* handled in pump_transfers */
|
||||
if (drv_data->cs_change)
|
||||
drv_data->cs_control(PXA2XX_CS_DEASSERT);
|
||||
/* Transfer delays and chip select release are
|
||||
* handled in pump_transfers or giveback
|
||||
*/
|
||||
|
||||
/* Move to next transfer */
|
||||
msg->state = next_transfer(drv_data);
|
||||
|
|
@ -602,10 +638,9 @@ static void int_transfer_complete(struct driver_data *drv_data)
|
|||
drv_data->cur_msg->actual_length += drv_data->len -
|
||||
(drv_data->rx_end - drv_data->rx);
|
||||
|
||||
/* Release chip select if requested, transfer delays are
|
||||
* handled in pump_transfers */
|
||||
if (drv_data->cs_change)
|
||||
drv_data->cs_control(PXA2XX_CS_DEASSERT);
|
||||
/* Transfer delays and chip select release are
|
||||
* handled in pump_transfers or giveback
|
||||
*/
|
||||
|
||||
/* Move to next transfer */
|
||||
drv_data->cur_msg->state = next_transfer(drv_data);
|
||||
|
|
@ -840,23 +875,40 @@ static void pump_transfers(unsigned long data)
|
|||
return;
|
||||
}
|
||||
|
||||
/* Delay if requested at end of transfer*/
|
||||
/* Delay if requested at end of transfer before CS change */
|
||||
if (message->state == RUNNING_STATE) {
|
||||
previous = list_entry(transfer->transfer_list.prev,
|
||||
struct spi_transfer,
|
||||
transfer_list);
|
||||
if (previous->delay_usecs)
|
||||
udelay(previous->delay_usecs);
|
||||
|
||||
/* Drop chip select only if cs_change is requested */
|
||||
if (previous->cs_change)
|
||||
drv_data->cs_control(PXA2XX_CS_DEASSERT);
|
||||
}
|
||||
|
||||
/* Check transfer length */
|
||||
if (transfer->len > 8191)
|
||||
{
|
||||
dev_warn(&drv_data->pdev->dev, "pump_transfers: transfer "
|
||||
"length greater than 8191\n");
|
||||
message->status = -EINVAL;
|
||||
giveback(drv_data);
|
||||
return;
|
||||
/* Check for transfers that need multiple DMA segments */
|
||||
if (transfer->len > MAX_DMA_LEN && chip->enable_dma) {
|
||||
|
||||
/* reject already-mapped transfers; PIO won't always work */
|
||||
if (message->is_dma_mapped
|
||||
|| transfer->rx_dma || transfer->tx_dma) {
|
||||
dev_err(&drv_data->pdev->dev,
|
||||
"pump_transfers: mapped transfer length "
|
||||
"of %lu is greater than %d\n",
|
||||
transfer->len, MAX_DMA_LEN);
|
||||
message->status = -EINVAL;
|
||||
giveback(drv_data);
|
||||
return;
|
||||
}
|
||||
|
||||
/* warn ... we force this to PIO mode */
|
||||
if (printk_ratelimit())
|
||||
dev_warn(&message->spi->dev, "pump_transfers: "
|
||||
"DMA disabled for transfer length %ld "
|
||||
"greater than %d\n",
|
||||
(long)drv_data->len, MAX_DMA_LEN);
|
||||
}
|
||||
|
||||
/* Setup the transfer state based on the type of transfer */
|
||||
|
|
@ -878,7 +930,6 @@ static void pump_transfers(unsigned long data)
|
|||
drv_data->len = transfer->len & DCMD_LENGTH;
|
||||
drv_data->write = drv_data->tx ? chip->write : null_writer;
|
||||
drv_data->read = drv_data->rx ? chip->read : null_reader;
|
||||
drv_data->cs_change = transfer->cs_change;
|
||||
|
||||
/* Change speed and bit per word on a per transfer */
|
||||
cr0 = chip->cr0;
|
||||
|
|
@ -925,7 +976,7 @@ static void pump_transfers(unsigned long data)
|
|||
&dma_thresh))
|
||||
if (printk_ratelimit())
|
||||
dev_warn(&message->spi->dev,
|
||||
"pump_transfer: "
|
||||
"pump_transfers: "
|
||||
"DMA burst size reduced to "
|
||||
"match bits_per_word\n");
|
||||
}
|
||||
|
|
@ -939,8 +990,23 @@ static void pump_transfers(unsigned long data)
|
|||
|
||||
message->state = RUNNING_STATE;
|
||||
|
||||
/* Try to map dma buffer and do a dma transfer if successful */
|
||||
if ((drv_data->dma_mapped = map_dma_buffers(drv_data))) {
|
||||
/* Try to map dma buffer and do a dma transfer if successful, but
|
||||
* only if the length is non-zero and less than MAX_DMA_LEN.
|
||||
*
|
||||
* Zero-length non-descriptor DMA is illegal on PXA2xx; force use
|
||||
* of PIO instead. Care is needed above because the transfer may
|
||||
* have have been passed with buffers that are already dma mapped.
|
||||
* A zero-length transfer in PIO mode will not try to write/read
|
||||
* to/from the buffers
|
||||
*
|
||||
* REVISIT large transfers are exactly where we most want to be
|
||||
* using DMA. If this happens much, split those transfers into
|
||||
* multiple DMA segments rather than forcing PIO.
|
||||
*/
|
||||
drv_data->dma_mapped = 0;
|
||||
if (drv_data->len > 0 && drv_data->len <= MAX_DMA_LEN)
|
||||
drv_data->dma_mapped = map_dma_buffers(drv_data);
|
||||
if (drv_data->dma_mapped) {
|
||||
|
||||
/* Ensure we have the correct interrupt handler */
|
||||
drv_data->transfer_handler = dma_transfer;
|
||||
|
|
|
|||
|
|
@ -267,16 +267,13 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
|
|||
cs->hw_mode |= SPMODE_LEN(bits_per_word);
|
||||
|
||||
if ((mpc83xx_spi->spibrg / hz) > 64) {
|
||||
cs->hw_mode |= SPMODE_DIV16;
|
||||
pm = mpc83xx_spi->spibrg / (hz * 64);
|
||||
if (pm > 16) {
|
||||
cs->hw_mode |= SPMODE_DIV16;
|
||||
pm /= 16;
|
||||
if (pm > 16) {
|
||||
dev_err(&spi->dev, "Requested speed is too "
|
||||
"low: %d Hz. Will use %d Hz instead.\n",
|
||||
hz, mpc83xx_spi->spibrg / 1024);
|
||||
pm = 16;
|
||||
}
|
||||
dev_err(&spi->dev, "Requested speed is too "
|
||||
"low: %d Hz. Will use %d Hz instead.\n",
|
||||
hz, mpc83xx_spi->spibrg / 1024);
|
||||
pm = 16;
|
||||
}
|
||||
} else
|
||||
pm = mpc83xx_spi->spibrg / (hz * 4);
|
||||
|
|
@ -315,11 +312,20 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
|
|||
if (t->bits_per_word)
|
||||
bits_per_word = t->bits_per_word;
|
||||
len = t->len;
|
||||
if (bits_per_word > 8)
|
||||
if (bits_per_word > 8) {
|
||||
/* invalid length? */
|
||||
if (len & 1)
|
||||
return -EINVAL;
|
||||
len /= 2;
|
||||
if (bits_per_word > 16)
|
||||
}
|
||||
if (bits_per_word > 16) {
|
||||
/* invalid length? */
|
||||
if (len & 1)
|
||||
return -EINVAL;
|
||||
len /= 2;
|
||||
}
|
||||
mpc83xx_spi->count = len;
|
||||
|
||||
INIT_COMPLETION(mpc83xx_spi->done);
|
||||
|
||||
/* enable rx ints */
|
||||
|
|
|
|||
|
|
@ -430,7 +430,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
|
|||
#endif
|
||||
|
||||
MODULE_ALIAS("platform:s3c2410-spi");
|
||||
static struct platform_driver s3c24xx_spidrv = {
|
||||
static struct platform_driver s3c24xx_spi_driver = {
|
||||
.remove = __exit_p(s3c24xx_spi_remove),
|
||||
.suspend = s3c24xx_spi_suspend,
|
||||
.resume = s3c24xx_spi_resume,
|
||||
|
|
@ -442,12 +442,12 @@ static struct platform_driver s3c24xx_spidrv = {
|
|||
|
||||
static int __init s3c24xx_spi_init(void)
|
||||
{
|
||||
return platform_driver_probe(&s3c24xx_spidrv, s3c24xx_spi_probe);
|
||||
return platform_driver_probe(&s3c24xx_spi_driver, s3c24xx_spi_probe);
|
||||
}
|
||||
|
||||
static void __exit s3c24xx_spi_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&s3c24xx_spidrv);
|
||||
platform_driver_unregister(&s3c24xx_spi_driver);
|
||||
}
|
||||
|
||||
module_init(s3c24xx_spi_init);
|
||||
|
|
|
|||
|
|
@ -208,6 +208,36 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
|
|||
return value;
|
||||
}
|
||||
|
||||
static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
/* Turn off the LCD controller and the DMA controller */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
|
||||
|
||||
/* Wait for the LCDC core to become idle */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
|
||||
msleep(10);
|
||||
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
|
||||
}
|
||||
|
||||
static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
atmel_lcdfb_stop_nowait(sinfo);
|
||||
|
||||
/* Wait for DMA engine to become idle... */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
|
||||
msleep(10);
|
||||
}
|
||||
|
||||
static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
(sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
|
||||
| ATMEL_LCDC_PWR);
|
||||
}
|
||||
|
||||
static void atmel_lcdfb_update_dma(struct fb_info *info,
|
||||
struct fb_var_screeninfo *var)
|
||||
{
|
||||
|
|
@ -424,26 +454,8 @@ static void atmel_lcdfb_reset(struct atmel_lcdfb_info *sinfo)
|
|||
{
|
||||
might_sleep();
|
||||
|
||||
/* LCD power off */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
|
||||
|
||||
/* wait for the LCDC core to become idle */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
|
||||
msleep(10);
|
||||
|
||||
/* DMA disable */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
|
||||
|
||||
/* wait for DMA engine to become idle */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
|
||||
msleep(10);
|
||||
|
||||
/* LCD power on */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
(sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
|
||||
|
||||
/* DMA enable */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
|
||||
atmel_lcdfb_stop(sinfo);
|
||||
atmel_lcdfb_start(sinfo);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -475,14 +487,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
|
|||
info->var.xres, info->var.yres,
|
||||
info->var.xres_virtual, info->var.yres_virtual);
|
||||
|
||||
/* Turn off the LCD controller and the DMA controller */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
|
||||
|
||||
/* Wait for the LCDC core to become idle */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
|
||||
msleep(10);
|
||||
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
|
||||
atmel_lcdfb_stop_nowait(sinfo);
|
||||
|
||||
if (info->var.bits_per_pixel == 1)
|
||||
info->fix.visual = FB_VISUAL_MONO01;
|
||||
|
|
@ -587,13 +592,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
|
|||
while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
|
||||
msleep(10);
|
||||
|
||||
dev_dbg(info->device, " * re-enable DMA engine\n");
|
||||
/* ...and enable it with updated configuration */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
|
||||
|
||||
dev_dbg(info->device, " * re-enable LCDC core\n");
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
(sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
|
||||
atmel_lcdfb_start(sinfo);
|
||||
|
||||
dev_dbg(info->device, " * DONE\n");
|
||||
|
||||
|
|
@ -1036,11 +1035,20 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
|
|||
struct fb_info *info = platform_get_drvdata(pdev);
|
||||
struct atmel_lcdfb_info *sinfo = info->par;
|
||||
|
||||
/*
|
||||
* We don't want to handle interrupts while the clock is
|
||||
* stopped. It may take forever.
|
||||
*/
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
|
||||
|
||||
sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(0);
|
||||
|
||||
atmel_lcdfb_stop(sinfo);
|
||||
atmel_lcdfb_stop_clock(sinfo);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1050,9 +1058,15 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
|
|||
struct atmel_lcdfb_info *sinfo = info->par;
|
||||
|
||||
atmel_lcdfb_start_clock(sinfo);
|
||||
atmel_lcdfb_start(sinfo);
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(1);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
|
||||
|
||||
/* Enable FIFO & DMA errors */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI
|
||||
| ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -125,8 +125,8 @@ static int bfs_create(struct inode *dir, struct dentry *dentry, int mode,
|
|||
inode->i_ino);
|
||||
if (err) {
|
||||
inode_dec_link_count(inode);
|
||||
iput(inode);
|
||||
mutex_unlock(&info->bfs_lock);
|
||||
iput(inode);
|
||||
return err;
|
||||
}
|
||||
mutex_unlock(&info->bfs_lock);
|
||||
|
|
|
|||
|
|
@ -594,7 +594,7 @@ static int ocfs2_direct_IO_get_blocks(struct inode *inode, sector_t iblock,
|
|||
goto bail;
|
||||
}
|
||||
|
||||
if (!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)) && !p_blkno) {
|
||||
if (!ocfs2_sparse_alloc(OCFS2_SB(inode->i_sb)) && !p_blkno && create) {
|
||||
ocfs2_error(inode->i_sb,
|
||||
"Inode %llu has a hole at block %llu\n",
|
||||
(unsigned long long)OCFS2_I(inode)->ip_blkno,
|
||||
|
|
|
|||
|
|
@ -499,9 +499,9 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
|
|||
if (!size)
|
||||
continue;
|
||||
if (from + size > get_capacity(disk)) {
|
||||
printk(KERN_ERR " %s: p%d exceeds device capacity\n",
|
||||
printk(KERN_WARNING
|
||||
"%s: p%d exceeds device capacity\n",
|
||||
disk->disk_name, p);
|
||||
continue;
|
||||
}
|
||||
res = add_partition(disk, p, from, size, state->parts[p].flags);
|
||||
if (res) {
|
||||
|
|
|
|||
|
|
@ -547,8 +547,8 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
|
|||
|
||||
for (tmp = dir->subdir; tmp; tmp = tmp->next)
|
||||
if (strcmp(tmp->name, dp->name) == 0) {
|
||||
printk(KERN_WARNING "proc_dir_entry '%s' already "
|
||||
"registered\n", dp->name);
|
||||
printk(KERN_WARNING "proc_dir_entry '%s/%s' already registered\n",
|
||||
dir->name, dp->name);
|
||||
dump_stack();
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -183,6 +183,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
|
|||
"SReclaimable: %8lu kB\n"
|
||||
"SUnreclaim: %8lu kB\n"
|
||||
"PageTables: %8lu kB\n"
|
||||
#ifdef CONFIG_QUICKLIST
|
||||
"Quicklists: %8lu kB\n"
|
||||
#endif
|
||||
"NFS_Unstable: %8lu kB\n"
|
||||
"Bounce: %8lu kB\n"
|
||||
"WritebackTmp: %8lu kB\n"
|
||||
|
|
@ -190,8 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
|
|||
"Committed_AS: %8lu kB\n"
|
||||
"VmallocTotal: %8lu kB\n"
|
||||
"VmallocUsed: %8lu kB\n"
|
||||
"VmallocChunk: %8lu kB\n"
|
||||
"Quicklists: %8lu kB\n",
|
||||
"VmallocChunk: %8lu kB\n",
|
||||
K(i.totalram),
|
||||
K(i.freeram),
|
||||
K(i.bufferram),
|
||||
|
|
@ -216,6 +218,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
|
|||
K(global_page_state(NR_SLAB_RECLAIMABLE)),
|
||||
K(global_page_state(NR_SLAB_UNRECLAIMABLE)),
|
||||
K(global_page_state(NR_PAGETABLE)),
|
||||
#ifdef CONFIG_QUICKLIST
|
||||
K(quicklist_total_size()),
|
||||
#endif
|
||||
K(global_page_state(NR_UNSTABLE_NFS)),
|
||||
K(global_page_state(NR_BOUNCE)),
|
||||
K(global_page_state(NR_WRITEBACK_TEMP)),
|
||||
|
|
@ -223,8 +228,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
|
|||
K(committed),
|
||||
(unsigned long)VMALLOC_TOTAL >> 10,
|
||||
vmi.used >> 10,
|
||||
vmi.largest_chunk >> 10,
|
||||
K(quicklist_total_size())
|
||||
vmi.largest_chunk >> 10
|
||||
);
|
||||
|
||||
len += hugetlb_report_meminfo(page + len);
|
||||
|
|
|
|||
|
|
@ -211,6 +211,7 @@ const struct file_operations udf_file_operations = {
|
|||
.release = udf_release_file,
|
||||
.fsync = udf_fsync_file,
|
||||
.splice_read = generic_file_splice_read,
|
||||
.llseek = generic_file_llseek,
|
||||
};
|
||||
|
||||
const struct inode_operations udf_file_inode_operations = {
|
||||
|
|
|
|||
|
|
@ -76,11 +76,24 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
|
|||
*err = -ENOSPC;
|
||||
|
||||
iinfo = UDF_I(inode);
|
||||
iinfo->i_unique = 0;
|
||||
iinfo->i_lenExtents = 0;
|
||||
iinfo->i_next_alloc_block = 0;
|
||||
iinfo->i_next_alloc_goal = 0;
|
||||
iinfo->i_strat4096 = 0;
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {
|
||||
iinfo->i_efe = 1;
|
||||
if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev)
|
||||
sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;
|
||||
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
|
||||
sizeof(struct extendedFileEntry),
|
||||
GFP_KERNEL);
|
||||
} else {
|
||||
iinfo->i_efe = 0;
|
||||
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
|
||||
sizeof(struct fileEntry),
|
||||
GFP_KERNEL);
|
||||
}
|
||||
if (!iinfo->i_ext.i_data) {
|
||||
iput(inode);
|
||||
*err = -ENOMEM;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
block = udf_new_block(dir->i_sb, NULL,
|
||||
dinfo->i_location.partitionReferenceNum,
|
||||
|
|
@ -111,6 +124,7 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
|
|||
lvhd->uniqueID = cpu_to_le64(uniqueID);
|
||||
mark_buffer_dirty(sbi->s_lvid_bh);
|
||||
}
|
||||
mutex_unlock(&sbi->s_alloc_mutex);
|
||||
inode->i_mode = mode;
|
||||
inode->i_uid = current->fsuid;
|
||||
if (dir->i_mode & S_ISGID) {
|
||||
|
|
@ -129,25 +143,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
|
|||
iinfo->i_lenEAttr = 0;
|
||||
iinfo->i_lenAlloc = 0;
|
||||
iinfo->i_use = 0;
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_EXTENDED_FE)) {
|
||||
iinfo->i_efe = 1;
|
||||
if (UDF_VERS_USE_EXTENDED_FE > sbi->s_udfrev)
|
||||
sbi->s_udfrev = UDF_VERS_USE_EXTENDED_FE;
|
||||
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
|
||||
sizeof(struct extendedFileEntry),
|
||||
GFP_KERNEL);
|
||||
} else {
|
||||
iinfo->i_efe = 0;
|
||||
iinfo->i_ext.i_data = kzalloc(inode->i_sb->s_blocksize -
|
||||
sizeof(struct fileEntry),
|
||||
GFP_KERNEL);
|
||||
}
|
||||
if (!iinfo->i_ext.i_data) {
|
||||
iput(inode);
|
||||
*err = -ENOMEM;
|
||||
mutex_unlock(&sbi->s_alloc_mutex);
|
||||
return NULL;
|
||||
}
|
||||
if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_AD_IN_ICB))
|
||||
iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
|
||||
else if (UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_USE_SHORT_AD))
|
||||
|
|
@ -158,7 +153,6 @@ struct inode *udf_new_inode(struct inode *dir, int mode, int *err)
|
|||
iinfo->i_crtime = current_fs_time(inode->i_sb);
|
||||
insert_inode_hash(inode);
|
||||
mark_inode_dirty(inode);
|
||||
mutex_unlock(&sbi->s_alloc_mutex);
|
||||
|
||||
if (DQUOT_ALLOC_INODE(inode)) {
|
||||
DQUOT_DROP(inode);
|
||||
|
|
|
|||
|
|
@ -97,6 +97,16 @@ extern void warn_slowpath(const char *file, const int line,
|
|||
unlikely(__ret_warn_once); \
|
||||
})
|
||||
|
||||
#define WARN_ONCE(condition, format...) ({ \
|
||||
static int __warned; \
|
||||
int __ret_warn_once = !!(condition); \
|
||||
\
|
||||
if (unlikely(__ret_warn_once)) \
|
||||
if (WARN(!__warned, format)) \
|
||||
__warned = 1; \
|
||||
unlikely(__ret_warn_once); \
|
||||
})
|
||||
|
||||
#define WARN_ON_RATELIMIT(condition, state) \
|
||||
WARN_ON((condition) && __ratelimit(state))
|
||||
|
||||
|
|
|
|||
|
|
@ -745,7 +745,7 @@ static inline int ata_ok(u8 status)
|
|||
static inline int lba_28_ok(u64 block, u32 n_block)
|
||||
{
|
||||
/* check the ending block number */
|
||||
return ((block + n_block - 1) < ((u64)1 << 28)) && (n_block <= 256);
|
||||
return ((block + n_block) < ((u64)1 << 28)) && (n_block <= 256);
|
||||
}
|
||||
|
||||
static inline int lba_48_ok(u64 block, u32 n_block)
|
||||
|
|
|
|||
|
|
@ -843,8 +843,6 @@ extern int blkdev_issue_flush(struct block_device *, sector_t *);
|
|||
*/
|
||||
extern int blk_verify_command(struct blk_cmd_filter *filter,
|
||||
unsigned char *cmd, int has_write_perm);
|
||||
extern int blk_register_filter(struct gendisk *disk);
|
||||
extern void blk_unregister_filter(struct gendisk *disk);
|
||||
extern void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter);
|
||||
|
||||
#define MAX_PHYS_SEGMENTS 128
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue