Commit b8307db2 authored by Ingo Molnar's avatar Ingo Molnar

Merge commit 'v2.6.28-rc7' into tracing/core

parents f0461d01 061e41fd
...@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). ...@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later).
pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg, pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
int nents, int direction) int nents, int direction)
Maps a scatter gather list from the block layer.
Returns: the number of physical segments mapped (this may be shorter Returns: the number of physical segments mapped (this may be shorter
than <nents> passed in if the block layer determines that some than <nents> passed in if some elements of the scatter/gather list are
elements of the scatter/gather list are physically adjacent and thus physically or virtually adjacent and an IOMMU maps them with a single
may be mapped with a single entry). entry).
Please note that the sg cannot be mapped again if it has been mapped once. Please note that the sg cannot be mapped again if it has been mapped once.
The mapping process is allowed to destroy information in the sg. The mapping process is allowed to destroy information in the sg.
......
...@@ -23,6 +23,7 @@ Contents: ...@@ -23,6 +23,7 @@ Contents:
1.3 sparc64 1.3 sparc64
1.4 ppc 1.4 ppc
1.5 SuperH 1.5 SuperH
1.6 Blackfin
2. "Policy" / "Governor"? 2. "Policy" / "Governor"?
2.1 Policy 2.1 Policy
...@@ -97,6 +98,17 @@ The following SuperH processors are supported by cpufreq: ...@@ -97,6 +98,17 @@ The following SuperH processors are supported by cpufreq:
SH-3 SH-3
SH-4 SH-4
1.6 Blackfin
------------
The following Blackfin processors are supported by cpufreq:
BF522, BF523, BF524, BF525, BF526, BF527, Rev 0.1 or higher
BF531, BF532, BF533, Rev 0.3 or higher
BF534, BF536, BF537, Rev 0.2 or higher
BF561, Rev 0.3 or higher
BF542, BF544, BF547, BF548, BF549, Rev 0.1 or higher
2. "Policy" / "Governor" ? 2. "Policy" / "Governor" ?
========================== ==========================
......
...@@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com> ...@@ -28,10 +28,7 @@ Manish Singh <manish.singh@oracle.com>
Caveats Caveats
======= =======
Features which OCFS2 does not support yet: Features which OCFS2 does not support yet:
- extended attributes
- quotas - quotas
- cluster aware flock
- cluster aware lockf
- Directory change notification (F_NOTIFY) - Directory change notification (F_NOTIFY)
- Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease) - Distributed Caching (F_SETLEASE/F_GETLEASE/break_lease)
- POSIX ACLs - POSIX ACLs
......
...@@ -44,6 +44,7 @@ Table of Contents ...@@ -44,6 +44,7 @@ Table of Contents
2.14 /proc/<pid>/io - Display the IO accounting fields 2.14 /proc/<pid>/io - Display the IO accounting fields
2.15 /proc/<pid>/coredump_filter - Core dump filtering settings 2.15 /proc/<pid>/coredump_filter - Core dump filtering settings
2.16 /proc/<pid>/mountinfo - Information about mounts 2.16 /proc/<pid>/mountinfo - Information about mounts
2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Preface Preface
...@@ -2483,4 +2484,30 @@ For more information on mount propagation see: ...@@ -2483,4 +2484,30 @@ For more information on mount propagation see:
Documentation/filesystems/sharedsubtree.txt Documentation/filesystems/sharedsubtree.txt
2.17 /proc/sys/fs/epoll - Configuration options for the epoll interface
--------------------------------------------------------
This directory contains configuration options for the epoll(7) interface.
max_user_instances
------------------
This is the maximum number of epoll file descriptors that a single user can
have open at a given time. The default value is 128, and should be enough
for normal users.
max_user_watches
----------------
Every epoll file descriptor can store a number of files to be monitored
for event readiness. Each one of these monitored files constitutes a "watch".
This configuration option sets the maximum number of "watches" that are
allowed for each user.
Each "watch" costs roughly 90 bytes on a 32bit kernel, and roughly 160 bytes
on a 64bit one.
The current default value for max_user_watches is the 1/32 of the available
low memory, divided for the "watch" cost in bytes.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
...@@ -130,12 +130,12 @@ The 2.6 kernel build process always creates a gzipped cpio format initramfs ...@@ -130,12 +130,12 @@ The 2.6 kernel build process always creates a gzipped cpio format initramfs
archive and links it into the resulting kernel binary. By default, this archive and links it into the resulting kernel binary. By default, this
archive is empty (consuming 134 bytes on x86). archive is empty (consuming 134 bytes on x86).
The config option CONFIG_INITRAMFS_SOURCE (for some reason buried under The config option CONFIG_INITRAMFS_SOURCE (in General Setup in menuconfig,
devices->block devices in menuconfig, and living in usr/Kconfig) can be used and living in usr/Kconfig) can be used to specify a source for the
to specify a source for the initramfs archive, which will automatically be initramfs archive, which will automatically be incorporated into the
incorporated into the resulting binary. This option can point to an existing resulting binary. This option can point to an existing gzipped cpio
gzipped cpio archive, a directory containing files to be archived, or a text archive, a directory containing files to be archived, or a text file
file specification such as the following example: specification such as the following example:
dir /dev 755 0 0 dir /dev 755 0 0
nod /dev/console 644 0 0 c 5 1 nod /dev/console 644 0 0 c 5 1
......
...@@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like: ...@@ -20,10 +20,11 @@ pressed or released a BUTTON_IRQ happens. The driver could look like:
static struct input_dev *button_dev; static struct input_dev *button_dev;
static void button_interrupt(int irq, void *dummy, struct pt_regs *fp) static irqreturn_t button_interrupt(int irq, void *dummy)
{ {
input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1); input_report_key(button_dev, BTN_0, inb(BUTTON_PORT) & 1);
input_sync(button_dev); input_sync(button_dev);
return IRQ_HANDLED;
} }
static int __init button_init(void) static int __init button_init(void)
......
...@@ -1072,10 +1072,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. ...@@ -1072,10 +1072,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
ref Reference board ref Reference board
dell-m4-1 Dell desktops dell-m4-1 Dell desktops
dell-m4-2 Dell desktops dell-m4-2 Dell desktops
dell-m4-3 Dell desktops
STAC92HD73* STAC92HD73*
ref Reference board ref Reference board
dell-m6 Dell desktops dell-m6-amic Dell desktops/laptops with analog mics
dell-m6-dmic Dell desktops/laptops with digital mics
dell-m6 Dell desktops/laptops with both type of mics
STAC9872 STAC9872
vaio Setup for VAIO FE550G/SZ110 vaio Setup for VAIO FE550G/SZ110
......
...@@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like: ...@@ -215,7 +215,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:
/* if your mach-* infrastructure doesn't support kernels that can /* if your mach-* infrastructure doesn't support kernels that can
* run on multiple boards, pdata wouldn't benefit from "__init". * run on multiple boards, pdata wouldn't benefit from "__init".
*/ */
static struct mysoc_spi_data __init pdata = { ... }; static struct mysoc_spi_data __initdata pdata = { ... };
static __init board_init(void) static __init board_init(void)
{ {
......
VERSION = 2 VERSION = 2
PATCHLEVEL = 6 PATCHLEVEL = 6
SUBLEVEL = 28 SUBLEVEL = 28
EXTRAVERSION = -rc6 EXTRAVERSION = -rc7
NAME = Killer Bat of Doom NAME = Erotic Pickled Herring
# *DOCUMENTATION* # *DOCUMENTATION*
# To see a list of typical targets execute "make help" # To see a list of typical targets execute "make help"
......
...@@ -79,8 +79,6 @@ config HAVE_KRETPROBES ...@@ -79,8 +79,6 @@ config HAVE_KRETPROBES
# task_pt_regs() in asm/processor.h or asm/ptrace.h # task_pt_regs() in asm/processor.h or asm/ptrace.h
# arch_has_single_step() if there is hardware single-step support # arch_has_single_step() if there is hardware single-step support
# arch_has_block_step() if there is hardware block-step support # arch_has_block_step() if there is hardware block-step support
# arch_ptrace() and not #define __ARCH_SYS_PTRACE
# compat_arch_ptrace() and #define __ARCH_WANT_COMPAT_SYS_PTRACE
# asm/syscall.h supplying asm-generic/syscall.h interface # asm/syscall.h supplying asm-generic/syscall.h interface
# linux/regset.h user_regset interfaces # linux/regset.h user_regset interfaces
# CORE_DUMP_USE_REGSET #define'd in linux/elf.h # CORE_DUMP_USE_REGSET #define'd in linux/elf.h
......
...@@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp) ...@@ -338,7 +338,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp)
return PCI_SLOT(dev->devfn); return PCI_SLOT(dev->devfn);
} }
void __devinit void
pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
struct resource *res) struct resource *res)
{ {
......
...@@ -121,7 +121,7 @@ wait_boot_cpu_to_stop(int cpuid) ...@@ -121,7 +121,7 @@ wait_boot_cpu_to_stop(int cpuid)
/* /*
* Where secondaries begin a life of C. * Where secondaries begin a life of C.
*/ */
void __init void __cpuinit
smp_callin(void) smp_callin(void)
{ {
int cpuid = hard_smp_processor_id(); int cpuid = hard_smp_processor_id();
...@@ -198,7 +198,7 @@ wait_for_txrdy (unsigned long cpumask) ...@@ -198,7 +198,7 @@ wait_for_txrdy (unsigned long cpumask)
* Send a message to a secondary's console. "START" is one such * Send a message to a secondary's console. "START" is one such
* interesting message. ;-) * interesting message. ;-)
*/ */
static void __init static void __cpuinit
send_secondary_console_msg(char *str, int cpuid) send_secondary_console_msg(char *str, int cpuid)
{ {
struct percpu_struct *cpu; struct percpu_struct *cpu;
...@@ -289,7 +289,7 @@ recv_secondary_console_msg(void) ...@@ -289,7 +289,7 @@ recv_secondary_console_msg(void)
/* /*
* Convince the console to have a secondary cpu begin execution. * Convince the console to have a secondary cpu begin execution.
*/ */
static int __init static int __cpuinit
secondary_cpu_start(int cpuid, struct task_struct *idle) secondary_cpu_start(int cpuid, struct task_struct *idle)
{ {
struct percpu_struct *cpu; struct percpu_struct *cpu;
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
static int opDEC_fix; static int opDEC_fix;
static void __init static void __cpuinit
opDEC_check(void) opDEC_check(void)
{ {
__asm__ __volatile__ ( __asm__ __volatile__ (
...@@ -1072,7 +1072,7 @@ do_entUnaUser(void __user * va, unsigned long opcode, ...@@ -1072,7 +1072,7 @@ do_entUnaUser(void __user * va, unsigned long opcode,
return; return;
} }
void __init void __cpuinit
trap_init(void) trap_init(void)
{ {
/* Tell PAL-code what global pointer we want in the kernel. */ /* Tell PAL-code what global pointer we want in the kernel. */
......
...@@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y ...@@ -179,7 +179,7 @@ CONFIG_MACH_HUSKY=y
# CONFIG_MACH_AKITA is not set # CONFIG_MACH_AKITA is not set
# CONFIG_MACH_SPITZ is not set # CONFIG_MACH_SPITZ is not set
# CONFIG_MACH_BORZOI is not set # CONFIG_MACH_BORZOI is not set
CONFIG_MACH_TOSA=y # CONFIG_MACH_TOSA is not set
# CONFIG_ARCH_VIPER is not set # CONFIG_ARCH_VIPER is not set
# CONFIG_ARCH_PXA_ESERIES is not set # CONFIG_ARCH_PXA_ESERIES is not set
# CONFIG_TRIZEPS_PXA is not set # CONFIG_TRIZEPS_PXA is not set
......
...@@ -565,7 +565,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state) ...@@ -565,7 +565,7 @@ static int mioa701_sys_suspend(struct sys_device *sysdev, pm_message_t state)
u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR); u32 *mem_resume_unknown = phys_to_virt(RESUME_UNKNOWN_ADDR);
/* Devices prepare suspend */ /* Devices prepare suspend */
is_bt_on = gpio_get_value(GPIO83_BT_ON); is_bt_on = !!gpio_get_value(GPIO83_BT_ON);
pxa2xx_mfp_set_lpm(GPIO83_BT_ON, pxa2xx_mfp_set_lpm(GPIO83_BT_ON,
is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW); is_bt_on ? MFP_LPM_DRIVE_HIGH : MFP_LPM_DRIVE_LOW);
......
...@@ -24,6 +24,7 @@ ENTRY(mioa701_jumpaddr) ...@@ -24,6 +24,7 @@ ENTRY(mioa701_jumpaddr)
1: 1:
mov r0, #0xa0000000 @ Don't suppose memory access works mov r0, #0xa0000000 @ Don't suppose memory access works
orr r0, r0, #0x00200000 @ even if it's supposed to orr r0, r0, #0x00200000 @ even if it's supposed to
orr r0, r0, #0x0000b000
mov r1, #0 mov r1, #0
str r1, [r0] @ Early disable resume for next boot str r1, [r0] @ Early disable resume for next boot
ldr r0, mioa701_jumpaddr @ (Murphy's Law) ldr r0, mioa701_jumpaddr @ (Murphy's Law)
......
...@@ -56,6 +56,9 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -56,6 +56,9 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO110_MMC_DAT_2, GPIO110_MMC_DAT_2,
GPIO111_MMC_DAT_3, GPIO111_MMC_DAT_3,
GPIO112_MMC_CMD, GPIO112_MMC_CMD,
GPIO14_GPIO, /* SD detect */
GPIO114_GPIO, /* SD power */
GPIO115_GPIO, /* SD r/o switch */
/* AC97 */ /* AC97 */
GPIO28_AC97_BITCLK, GPIO28_AC97_BITCLK,
...@@ -64,6 +67,7 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -64,6 +67,7 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO31_AC97_SYNC, GPIO31_AC97_SYNC,
/* IrDA */ /* IrDA */
GPIO40_GPIO, /* ir disable */
GPIO46_FICP_RXD, GPIO46_FICP_RXD,
GPIO47_FICP_TXD, GPIO47_FICP_TXD,
...@@ -71,7 +75,8 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -71,7 +75,8 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO16_PWM0_OUT, GPIO16_PWM0_OUT,
/* USB */ /* USB */
GPIO13_GPIO, GPIO13_GPIO, /* usb detect */
GPIO95_GPIO, /* usb power */
/* PCMCIA */ /* PCMCIA */
GPIO48_nPOE, GPIO48_nPOE,
...@@ -84,6 +89,45 @@ static unsigned long palmtx_pin_config[] __initdata = { ...@@ -84,6 +89,45 @@ static unsigned long palmtx_pin_config[] __initdata = {
GPIO55_nPREG, GPIO55_nPREG,
GPIO56_nPWAIT, GPIO56_nPWAIT,
GPIO57_nIOIS16, GPIO57_nIOIS16,
GPIO94_GPIO, /* wifi power 1 */
GPIO108_GPIO, /* wifi power 2 */
GPIO116_GPIO, /* wifi ready */
/* MATRIX KEYPAD */
GPIO100_KP_MKIN_0,
GPIO101_KP_MKIN_1,
GPIO102_KP_MKIN_2,
GPIO97_KP_MKIN_3,
GPIO103_KP_MKOUT_0,
GPIO104_KP_MKOUT_1,
GPIO105_KP_MKOUT_2,
/* LCD */
GPIO58_LCD_LDD_0,
GPIO59_LCD_LDD_1,
GPIO60_LCD_LDD_2,
GPIO61_LCD_LDD_3,
GPIO62_LCD_LDD_4,
GPIO63_LCD_LDD_5,
GPIO64_LCD_LDD_6,
GPIO65_LCD_LDD_7,
GPIO66_LCD_LDD_8,
GPIO67_LCD_LDD_9,
GPIO68_LCD_LDD_10,
GPIO69_LCD_LDD_11,
GPIO70_LCD_LDD_12,
GPIO71_LCD_LDD_13,
GPIO72_LCD_LDD_14,
GPIO73_LCD_LDD_15,
GPIO74_LCD_FCLK,
GPIO75_LCD_LCLK,
GPIO76_LCD_PCLK,
GPIO77_LCD_BIAS,
/* MISC. */
GPIO10_GPIO, /* hotsync button */
GPIO12_GPIO, /* power detect */
GPIO107_GPIO, /* earphone detect */
}; };
/****************************************************************************** /******************************************************************************
...@@ -95,32 +139,49 @@ static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int, ...@@ -95,32 +139,49 @@ static int palmtx_mci_init(struct device *dev, irq_handler_t palmtx_detect_int,
int err = 0; int err = 0;
/* Setup an interrupt for detecting card insert/remove events */ /* Setup an interrupt for detecting card insert/remove events */
err = request_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, palmtx_detect_int, err = gpio_request(GPIO_NR_PALMTX_SD_DETECT_N, "SD IRQ");
IRQF_DISABLED | IRQF_SAMPLE_RANDOM | if (err)
goto err;
err = gpio_direction_input(GPIO_NR_PALMTX_SD_DETECT_N);
if (err)
goto err2;
err = request_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N),
palmtx_detect_int, IRQF_DISABLED | IRQF_SAMPLE_RANDOM |
IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,
"SD/MMC card detect", data); "SD/MMC card detect", data);
if (err) { if (err) {
printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n", printk(KERN_ERR "%s: cannot request SD/MMC card detect IRQ\n",
__func__); __func__);
return err; goto err2;
} }
err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER"); err = gpio_request(GPIO_NR_PALMTX_SD_POWER, "SD_POWER");
if (err) if (err)
goto pwr_err; goto err3;
err = gpio_direction_output(GPIO_NR_PALMTX_SD_POWER, 0);
if (err)
goto err4;
err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY"); err = gpio_request(GPIO_NR_PALMTX_SD_READONLY, "SD_READONLY");
if (err) if (err)
goto ro_err; goto err4;
err = gpio_direction_input(GPIO_NR_PALMTX_SD_READONLY);
if (err)
goto err5;
printk(KERN_DEBUG "%s: irq registered\n", __func__); printk(KERN_DEBUG "%s: irq registered\n", __func__);
return 0; return 0;
ro_err: err5:
gpio_free(GPIO_NR_PALMTX_SD_READONLY);
err4:
gpio_free(GPIO_NR_PALMTX_SD_POWER); gpio_free(GPIO_NR_PALMTX_SD_POWER);
pwr_err: err3:
free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
err2:
gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
err:
return err; return err;
} }
...@@ -128,7 +189,8 @@ static void palmtx_mci_exit(struct device *dev, void *data) ...@@ -128,7 +189,8 @@ static void palmtx_mci_exit(struct device *dev, void *data)
{ {
gpio_free(GPIO_NR_PALMTX_SD_READONLY); gpio_free(GPIO_NR_PALMTX_SD_READONLY);
gpio_free(GPIO_NR_PALMTX_SD_POWER); gpio_free(GPIO_NR_PALMTX_SD_POWER);
free_irq(IRQ_GPIO_PALMTX_SD_DETECT_N, data); free_irq(gpio_to_irq(GPIO_NR_PALMTX_SD_DETECT_N), data);
gpio_free(GPIO_NR_PALMTX_SD_DETECT_N);
} }
static void palmtx_mci_power(struct device *dev, unsigned int vdd) static void palmtx_mci_power(struct device *dev, unsigned int vdd)
...@@ -167,7 +229,6 @@ static unsigned int palmtx_matrix_keys[] = { ...@@ -167,7 +229,6 @@ static unsigned int palmtx_matrix_keys[] = {
KEY(3, 0, KEY_RIGHT), KEY(3, 0, KEY_RIGHT),
KEY(3, 2, KEY_LEFT), KEY(3, 2, KEY_LEFT),
}; };
static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = { static struct pxa27x_keypad_platform_data palmtx_keypad_platform_data = {
...@@ -209,11 +270,19 @@ static int palmtx_backlight_init(struct device *dev) ...@@ -209,11 +270,19 @@ static int palmtx_backlight_init(struct device *dev)
ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER"); ret = gpio_request(GPIO_NR_PALMTX_BL_POWER, "BL POWER");
if (ret) if (ret)
goto err; goto err;
ret = gpio_direction_output(GPIO_NR_PALMTX_BL_POWER, 0);
if (ret)
goto err2;
ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER"); ret = gpio_request(GPIO_NR_PALMTX_LCD_POWER, "LCD POWER");
if (ret) if (ret)
goto err2; goto err2;
ret = gpio_direction_output(GPIO_NR_PALMTX_LCD_POWER, 0);
if (ret)
goto err3;
return 0; return 0;
err3:
gpio_free(GPIO_NR_PALMTX_LCD_POWER);
err2: err2:
gpio_free(GPIO_NR_PALMTX_BL_POWER); gpio_free(GPIO_NR_PALMTX_BL_POWER);
err: err:
...@@ -254,6 +323,24 @@ static struct platform_device palmtx_backlight = { ...@@ -254,6 +323,24 @@ static struct platform_device palmtx_backlight = {
/****************************************************************************** /******************************************************************************
* IrDA * IrDA
******************************************************************************/ ******************************************************************************/
static int palmtx_irda_startup(struct device *dev)
{
int err;
err = gpio_request(GPIO_NR_PALMTX_IR_DISABLE, "IR DISABLE");
if (err)
goto err;
err = gpio_direction_output(GPIO_NR_PALMTX_IR_DISABLE, 1);
if (err)
gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
err:
return err;
}
static void palmtx_irda_shutdown(struct device *dev)
{
gpio_free(GPIO_NR_PALMTX_IR_DISABLE);
}
static void palmtx_irda_transceiver_mode(struct device *dev, int mode) static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
{ {
gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF); gpio_set_value(GPIO_NR_PALMTX_IR_DISABLE, mode & IR_OFF);
...@@ -261,6 +348,8 @@ static void palmtx_irda_transceiver_mode(struct device *dev, int mode) ...@@ -261,6 +348,8 @@ static void palmtx_irda_transceiver_mode(struct device *dev, int mode)
} }
static struct pxaficp_platform_data palmtx_ficp_platform_data = { static struct pxaficp_platform_data palmtx_ficp_platform_data = {
.startup = palmtx_irda_startup,
.shutdown = palmtx_irda_shutdown,
.transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF, .transceiver_cap = IR_SIRMODE | IR_FIRMODE | IR_OFF,
.transceiver_mode = palmtx_irda_transceiver_mode, .transceiver_mode = palmtx_irda_transceiver_mode,
}; };
...@@ -268,17 +357,11 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = { ...@@ -268,17 +357,11 @@ static struct pxaficp_platform_data palmtx_ficp_platform_data = {
/****************************************************************************** /******************************************************************************
* UDC * UDC
******************************************************************************/ ******************************************************************************/
static void palmtx_udc_command(int cmd)
{
gpio_set_value(GPIO_NR_PALMTX_USB_POWER, !cmd);
udelay(50);
gpio_set_value(GPIO_NR_PALMTX_USB_PULLUP, !cmd);
}
static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = { static struct pxa2xx_udc_mach_info palmtx_udc_info __initdata = {
.gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N, .gpio_vbus = GPIO_NR_PALMTX_USB_DETECT_N,
.gpio_vbus_inverted = 1, .gpio_vbus_inverted = 1,
.udc_command = palmtx_udc_command, .gpio_pullup = GPIO_NR_PALMTX_USB_POWER,
.gpio_pullup_inverted = 0,
}; };
/****************************************************************************** /******************************************************************************
...@@ -290,17 +373,16 @@ static int power_supply_init(struct device *dev) ...@@ -290,17 +373,16 @@ static int power_supply_init(struct device *dev)
ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC"); ret = gpio_request(GPIO_NR_PALMTX_POWER_DETECT, "CABLE_STATE_AC");
if (ret) if (ret)
goto err_cs_ac; goto err1;
ret = gpio_direction_input(GPIO_NR_PALMTX_POWER_DETECT);
ret = gpio_request(GPIO_NR_PALMTX_USB_DETECT_N, "CABLE_STATE_USB");
if (ret) if (ret)
goto err_cs_usb; goto err2;
return 0; return 0;
err_cs_usb: err2:
gpio_free(GPIO_NR_PALMTX_POWER_DETECT); gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
err_cs_ac: err1:
return ret; return ret;
} }
...@@ -309,14 +391,8 @@ static int palmtx_is_ac_online(void) ...@@ -309,14 +391,8 @@ static int palmtx_is_ac_online(void)
return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT); return gpio_get_value(GPIO_NR_PALMTX_POWER_DETECT);
} }
static int palmtx_is_usb_online(void)
{
return !gpio_get_value(GPIO_NR_PALMTX_USB_DETECT_N);
}
static void power_supply_exit(struct device *dev) static void power_supply_exit(struct device *dev)
{ {
gpio_free(GPIO_NR_PALMTX_USB_DETECT_N);
gpio_free(GPIO_NR_PALMTX_POWER_DETECT); gpio_free(GPIO_NR_PALMTX_POWER_DETECT);
} }
...@@ -327,7 +403,6 @@ static char *palmtx_supplicants[] = { ...@@ -327,7 +403,6 @@ static char *palmtx_supplicants[] = {
static struct pda_power_pdata power_supply_info = { static struct pda_power_pdata power_supply_info = {
.init = power_supply_init, .init = power_supply_init,
.is_ac_online = palmtx_is_ac_online, .is_ac_online = palmtx_is_ac_online,
.is_usb_online = palmtx_is_usb_online,
.exit = power_supply_exit, .exit = power_supply_exit,
.supplied_to = palmtx_supplicants, .supplied_to = palmtx_supplicants,
.num_supplicants = ARRAY_SIZE(palmtx_supplicants), .num_supplicants = ARRAY_SIZE(palmtx_supplicants),
...@@ -410,12 +485,23 @@ static void __init palmtx_map_io(void) ...@@ -410,12 +485,23 @@ static void __init palmtx_map_io(void)
iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc)); iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
} }
/* setup udc GPIOs initial state */
static void __init palmtx_udc_init(void)
{
if (!gpio_request(GPIO_NR_PALMTX_USB_POWER, "UDC Vbus")) {
gpio_direction_output(GPIO_NR_PALMTX_USB_POWER, 1);
gpio_free(GPIO_NR_PALMTX_USB_POWER);
}
}
static void __init palmtx_init(void) static void __init palmtx_init(void)
{ {
pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config)); pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config));
set_pxa_fb_info(&palmtx_lcd_screen); set_pxa_fb_info(&palmtx_lcd_screen);
pxa_set_mci_info(&palmtx_mci_platform_data); pxa_set_mci_info(&palmtx_mci_platform_data);
palmtx_udc_init();
pxa_set_udc_info(&palmtx_udc_info); pxa_set_udc_info(&palmtx_udc_info);
pxa_set_ac97_info(NULL); pxa_set_ac97_info(NULL);
pxa_set_ficp_info(&palmtx_ficp_platform_data); pxa_set_ficp_info(&palmtx_ficp_platform_data);
......
...@@ -385,6 +385,7 @@ static struct soc_camera_link iclink[] = { ...@@ -385,6 +385,7 @@ static struct soc_camera_link iclink[] = {
.gpio = NR_BUILTIN_GPIO + 1, .gpio = NR_BUILTIN_GPIO + 1,
}, { }, {
.bus_id = 0, /* Must match with the camera ID above */ .bus_id = 0, /* Must match with the camera ID above */
.gpio = -ENXIO,
} }
}; };
......
...@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info { ...@@ -18,6 +18,7 @@ struct s3c2410_spigpio_info {
unsigned long pin_mosi; unsigned long pin_mosi;
unsigned long pin_miso; unsigned long pin_miso;
int num_chipselect;
int bus_num; int bus_num;
void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs); void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
......
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
#define OMAP24XX_GPIO_IRQSTATUS2 0x0028 #define OMAP24XX_GPIO_IRQSTATUS2 0x0028
#define OMAP24XX_GPIO_IRQENABLE2 0x002c #define OMAP24XX_GPIO_IRQENABLE2 0x002c
#define OMAP24XX_GPIO_IRQENABLE1 0x001c #define OMAP24XX_GPIO_IRQENABLE1 0x001c
#define OMAP24XX_GPIO_WAKE_EN 0x0020
#define OMAP24XX_GPIO_CTRL 0x0030 #define OMAP24XX_GPIO_CTRL 0x0030
#define OMAP24XX_GPIO_OE 0x0034 #define OMAP24XX_GPIO_OE 0x0034
#define OMAP24XX_GPIO_DATAIN 0x0038 #define OMAP24XX_GPIO_DATAIN 0x0038
...@@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg) ...@@ -1551,7 +1552,7 @@ static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
#endif #endif
#if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX) #if defined(CONFIG_ARCH_OMAP24XX) || defined(CONFIG_ARCH_OMAP34XX)
case METHOD_GPIO_24XX: case METHOD_GPIO_24XX:
wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_status = bank->base + OMAP24XX_GPIO_WAKE_EN;
wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA; wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA; wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
break; break;
...@@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev) ...@@ -1574,7 +1575,7 @@ static int omap_gpio_resume(struct sys_device *dev)
{ {
int i; int i;
if (!cpu_is_omap24xx() && !cpu_is_omap16xx()) if (!cpu_class_is_omap2() && !cpu_is_omap16xx())
return 0; return 0;
for (i = 0; i < gpio_bank_count; i++) { for (i = 0; i < gpio_bank_count; i++) {
......
...@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk); ...@@ -128,7 +128,7 @@ void clk_deny_idle(struct clk *clk);
* clk_allow_idle - Counters previous clk_deny_idle * clk_allow_idle - Counters previous clk_deny_idle
* @clk: clock signal handle * @clk: clock signal handle
*/ */
void clk_deny_idle(struct clk *clk); void clk_allow_idle(struct clk *clk);
extern void omap_pm_idle(void); extern void omap_pm_idle(void);
extern void omap_pm_suspend(void); extern void omap_pm_suspend(void);
......
...@@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, ...@@ -35,22 +35,21 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
int error = -EBADF; int error = -EBADF;
struct file * file = NULL; struct file * file = NULL;
flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
if (!(flags & MAP_ANONYMOUS)) {
file = fget(fd);
if (!file)
goto out;
}
/* As with sparc32, make sure the shift for mmap2 is constant /* As with sparc32, make sure the shift for mmap2 is constant
(12), no matter what PAGE_SIZE we have.... */ (12), no matter what PAGE_SIZE we have.... */
/* But unlike sparc32, don't just silently break if we're /* But unlike sparc32, don't just silently break if we're
trying to map something we can't */ trying to map something we can't */
if (pgoff & ((1<<(PAGE_SHIFT-12))-1)) if (pgoff & ((1 << (PAGE_SHIFT - 12)) - 1))
return -EINVAL; return -EINVAL;
pgoff >>= PAGE_SHIFT - 12;
pgoff >>= (PAGE_SHIFT - 12); flags &= ~(MAP_EXECUTABLE | MAP_DENYWRITE);
if (!(flags & MAP_ANONYMOUS)) {
file = fget(fd);
if (!file)
goto out;
}
down_write(&current->mm->mmap_sem); down_write(&current->mm->mmap_sem);
error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
......
...@@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs) ...@@ -325,8 +325,6 @@ static inline unsigned long user_stack_pointer(struct pt_regs *regs)
#define arch_has_block_step() (1) #define arch_has_block_step() (1)
extern void user_enable_block_step(struct task_struct *); extern void user_enable_block_step(struct task_struct *);
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif /* !__KERNEL__ */ #endif /* !__KERNEL__ */
/* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */ /* pt_all_user_regs is used for PTRACE_GETREGS PTRACE_SETREGS */
......
...@@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup); ...@@ -292,7 +292,7 @@ EXPORT_SYMBOL(sn_io_slot_fixup);
* sn_pci_controller_fixup() - This routine sets up a bus's resources * sn_pci_controller_fixup() - This routine sets up a bus's resources
* consistent with the Linux PCI abstraction layer. * consistent with the Linux PCI abstraction layer.
*/ */
static void static void __init
sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
{ {
s64 status = 0; s64 status = 0;
......
...@@ -23,7 +23,7 @@ __INITDATA ...@@ -23,7 +23,7 @@ __INITDATA
/* /*
* References to members of the boot_cpu_data structure. * References to members of the boot_cpu_data structure.
*/ */
.text .section .text.head, "ax"
.global start_kernel .global start_kernel
.global __bss_start .global __bss_start
.global _end .global _end
...@@ -133,7 +133,6 @@ loop1: ...@@ -133,7 +133,6 @@ loop1:
/* /*
* AP startup routine * AP startup routine
*/ */
.text
.global eit_vector .global eit_vector
ENTRY(startup_AP) ENTRY(startup_AP)
;; setup EVB ;; setup EVB
...@@ -230,6 +229,7 @@ ENTRY(startup_AP) ...@@ -230,6 +229,7 @@ ENTRY(startup_AP)
nop nop
#endif /* CONFIG_SMP */ #endif /* CONFIG_SMP */
.text
ENTRY(stack_start) ENTRY(stack_start)
.long init_thread_union+8192 .long init_thread_union+8192
.long __KERNEL_DS .long __KERNEL_DS
......
...@@ -27,6 +27,7 @@ SECTIONS ...@@ -27,6 +27,7 @@ SECTIONS
_text = .; /* Text and read-only data */ _text = .; /* Text and read-only data */
.boot : { *(.boot) } = 0 .boot : { *(.boot) } = 0
.text : { .text : {
*(.text.head)
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
LOCK_TEXT LOCK_TEXT
......
...@@ -7,20 +7,31 @@ ...@@ -7,20 +7,31 @@
#include <asm/break.h> #include <asm/break.h>
#define BUG() \ static inline void __noreturn BUG(void)
do { \ {
__asm__ __volatile__("break %0" : : "i" (BRK_BUG)); \ __asm__ __volatile__("break %0" : : "i" (BRK_BUG));
} while (0) /* Fool GCC into thinking the function doesn't return. */
while (1)
;
}
#define HAVE_ARCH_BUG #define HAVE_ARCH_BUG
#if (_MIPS_ISA > _MIPS_ISA_MIPS1) #if (_MIPS_ISA > _MIPS_ISA_MIPS1)
#define BUG_ON(condition) \ static inline void __BUG_ON(unsigned long condition)
do { \ {
__asm__ __volatile__("tne $0, %0, %1" \ if (__builtin_constant_p(condition)) {
: : "r" (condition), "i" (BRK_BUG)); \ if (condition)
} while (0) BUG();
else
return;
}
__asm__ __volatile__("tne $0, %0, %1"
: : "r" (condition), "i" (BRK_BUG));
}
#define BUG_ON(C) __BUG_ON((unsigned long)(C))
#define HAVE_ARCH_BUG_ON #define HAVE_ARCH_BUG_ON
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
#ifndef _ASM_PTRACE_H #ifndef _ASM_PTRACE_H
#define _ASM_PTRACE_H #define _ASM_PTRACE_H
#ifdef CONFIG_64BIT
#define __ARCH_WANT_COMPAT_SYS_PTRACE
#endif
/* 0 - 31 are integer registers, 32 - 63 are fp registers. */ /* 0 - 31 are integer registers, 32 - 63 are fp registers. */
#define FPR_BASE 32 #define FPR_BASE 32
#define PC 64 #define PC 64
......
...@@ -522,17 +522,7 @@ static int gdbstub_single_step(struct pt_regs *regs) ...@@ -522,17 +522,7 @@ static int gdbstub_single_step(struct pt_regs *regs)
} else { } else {
switch (cur) { switch (cur) {
/* Bxx (d8,PC) */ /* Bxx (d8,PC) */
case 0xc0: case 0xc0 ... 0xca:
case 0xc1:
case 0xc2:
case 0xc3:
case 0xc4:
case 0xc5:
case 0xc6:
case 0xc7:
case 0xc8:
case 0xc9:
case 0xca:
if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0) if (gdbstub_read_byte(pc + 1, (u8 *) &x) < 0)
goto fault; goto fault;
if (!__gdbstub_mark_bp(pc + 2, 0)) if (!__gdbstub_mark_bp(pc + 2, 0))
...@@ -543,17 +533,7 @@ static int gdbstub_single_step(struct pt_regs *regs) ...@@ -543,17 +533,7 @@ static int gdbstub_single_step(struct pt_regs *regs)
break; break;
/* LXX (d8,PC) */ /* LXX (d8,PC) */
case 0xd0: case 0xd0 ... 0xda:
case 0xd1:
case 0xd2:
case 0xd3:
case 0xd4:
case 0xd5:
case 0xd6:
case 0xd7:
case 0xd8:
case 0xd9:
case 0xda:
if (!__gdbstub_mark_bp(pc + 1, 0)) if (!__gdbstub_mark_bp(pc + 1, 0))
goto fault; goto fault;
if (regs->pc != regs->lar && if (regs->pc != regs->lar &&
......
...@@ -42,9 +42,9 @@ struct parisc_driver { ...@@ -42,9 +42,9 @@ struct parisc_driver {
#define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv)
#define parisc_parent(d) to_parisc_device(d->dev.parent) #define parisc_parent(d) to_parisc_device(d->dev.parent)
static inline char *parisc_pathname(struct parisc_device *d) static inline const char *parisc_pathname(struct parisc_device *d)
{ {
return d->dev.bus_id; return dev_name(&d->dev);
} }
static inline void static inline void
......
...@@ -24,13 +24,12 @@ typedef int __kernel_daddr_t; ...@@ -24,13 +24,12 @@ typedef int __kernel_daddr_t;
typedef unsigned long __kernel_size_t; typedef unsigned long __kernel_size_t;
typedef long __kernel_ssize_t; typedef long __kernel_ssize_t;
typedef long __kernel_ptrdiff_t; typedef long __kernel_ptrdiff_t;
typedef long __kernel_time_t;
#else #else
typedef unsigned int __kernel_size_t; typedef unsigned int __kernel_size_t;
typedef int __kernel_ssize_t; typedef int __kernel_ssize_t;
typedef int __kernel_ptrdiff_t; typedef int __kernel_ptrdiff_t;
typedef long __kernel_time_t;
#endif #endif
typedef long __kernel_time_t;
typedef char * __kernel_caddr_t; typedef char * __kernel_caddr_t;
typedef unsigned short __kernel_uid16_t; typedef unsigned short __kernel_uid16_t;
......
...@@ -47,8 +47,6 @@ struct pt_regs { ...@@ -47,8 +47,6 @@ struct pt_regs {
#define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS)) #define task_regs(task) ((struct pt_regs *) ((char *)(task) + TASK_REGS))
#define __ARCH_WANT_COMPAT_SYS_PTRACE
struct task_struct; struct task_struct;
#define arch_has_single_step() 1 #define arch_has_single_step() 1
void user_disable_single_step(struct task_struct *task); void user_disable_single_step(struct task_struct *task);
......
...@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly; ...@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly;
EXPORT_SYMBOL(hppa_dma_ops); EXPORT_SYMBOL(hppa_dma_ops);
static struct device root = { static struct device root = {
.bus_id = "parisc", .init_name = "parisc",
}; };
static inline int check_dev(struct device *dev) static inline int check_dev(struct device *dev)
...@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath); ...@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath);
static void setup_bus_id(struct parisc_device *padev) static void setup_bus_id(struct parisc_device *padev)
{ {
struct hardware_path path; struct hardware_path path;
char *output = padev->dev.bus_id; char name[20];
char *output = name;
int i; int i;
get_node_path(padev->dev.parent, &path); get_node_path(padev->dev.parent, &path);
...@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev) ...@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev)
output += sprintf(output, "%u:", (unsigned char) path.bc[i]); output += sprintf(output, "%u:", (unsigned char) path.bc[i]);
} }
sprintf(output, "%u", (unsigned char) padev->hw_path); sprintf(output, "%u", (unsigned char) padev->hw_path);
dev_set_name(&padev->dev, name);
} }
struct parisc_device * create_tree_node(char id, struct device *parent) struct parisc_device * create_tree_node(char id, struct device *parent)
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/kallsyms.h>
#include <linux/bug.h> #include <linux/bug.h>
#include <asm/assembly.h> #include <asm/assembly.h>
...@@ -51,7 +50,7 @@ ...@@ -51,7 +50,7 @@
DEFINE_SPINLOCK(pa_dbit_lock); DEFINE_SPINLOCK(pa_dbit_lock);
#endif #endif
void parisc_show_stack(struct task_struct *t, unsigned long *sp, static void parisc_show_stack(struct task_struct *task, unsigned long *sp,
struct pt_regs *regs); struct pt_regs *regs);
static int printbinary(char *buf, unsigned long x, int nbits) static int printbinary(char *buf, unsigned long x, int nbits)
...@@ -121,18 +120,19 @@ static void print_fr(char *level, struct pt_regs *regs) ...@@ -121,18 +120,19 @@ static void print_fr(char *level, struct pt_regs *regs)
void show_regs(struct pt_regs *regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i, user;
char *level; char *level;
unsigned long cr30, cr31; unsigned long cr30, cr31;
level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT; user = user_mode(regs);
level = user ? KERN_DEBUG : KERN_CRIT;
print_gr(level, regs); print_gr(level, regs);
for (i = 0; i < 8; i += 4) for (i = 0; i < 8; i += 4)
PRINTREGS(level, regs->sr, "sr", RFMT, i); PRINTREGS(level, regs->sr, "sr", RFMT, i);
if (user_mode(regs)) if (user)
print_fr(level, regs); print_fr(level, regs);
cr30 = mfctl(30); cr30 = mfctl(30);
...@@ -145,14 +145,18 @@ void show_regs(struct pt_regs *regs) ...@@ -145,14 +145,18 @@ void show_regs(struct pt_regs *regs)
printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n", printk("%s CPU: %8d CR30: " RFMT " CR31: " RFMT "\n",
level, current_thread_info()->cpu, cr30, cr31); level, current_thread_info()->cpu, cr30, cr31);
printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28); printk("%s ORIG_R28: " RFMT "\n", level, regs->orig_r28);
printk(level);
print_symbol(" IAOQ[0]: %s\n", regs->iaoq[0]); if (user) {
printk(level); printk("%s IAOQ[0]: " RFMT "\n", level, regs->iaoq[0]);
print_symbol(" IAOQ[1]: %s\n", regs->iaoq[1]); printk("%s IAOQ[1]: " RFMT "\n", level, regs->iaoq[1]);
printk(level); printk("%s RP(r2): " RFMT "\n", level, regs->gr[2]);
print_symbol(" RP(r2): %s\n", regs->gr[2]); } else {
printk("%s IAOQ[0]: %pS\n", level, (void *) regs->iaoq[0]);
parisc_show_stack(current, NULL, regs); printk("%s IAOQ[1]: %pS\n", level, (void *) regs->iaoq[1]);
printk("%s RP(r2): %pS\n", level, (void *) regs->gr[2]);
parisc_show_stack(current, NULL, regs);
}
} }
...@@ -173,20 +177,15 @@ static void do_show_stack(struct unwind_frame_info *info) ...@@ -173,20 +177,15 @@ static void do_show_stack(struct unwind_frame_info *info)
break; break;
if (__kernel_text_address(info->ip)) { if (__kernel_text_address(info->ip)) {
printk("%s [<" RFMT ">] ", (i&0x3)==1 ? KERN_CRIT : "", info->ip); printk(KERN_CRIT " [<" RFMT ">] %pS\n",
#ifdef CONFIG_KALLSYMS info->ip, (void *) info->ip);
print_symbol("%s\n", info->ip);
#else
if ((i & 0x03) == 0)
printk("\n");
#endif
i++; i++;
} }
} }
printk("\n"); printk(KERN_CRIT "\n");
} }
void parisc_show_stack(struct task_struct *task, unsigned long *sp, static void parisc_show_stack(struct task_struct *task, unsigned long *sp,
struct pt_regs *regs) struct pt_regs *regs)
{ {
struct unwind_frame_info info; struct unwind_frame_info info;
......
...@@ -18,8 +18,8 @@ / { ...@@ -18,8 +18,8 @@ / {
#size-cells = <1>; #size-cells = <1>;
aliases { aliases {
ethernet0 = &enet0; ethernet0 = &enet1;
ethernet1 = &enet1; ethernet1 = &enet0;
serial0 = &serial0; serial0 = &serial0;
serial1 = &serial1; serial1 = &serial1;
pci0 = &pci0; pci0 = &pci0;
......
...@@ -90,7 +90,7 @@ L2: l2-cache-controller@20000 { ...@@ -90,7 +90,7 @@ L2: l2-cache-controller@20000 {
compatible = "fsl,mpc8572-l2-cache-controller"; compatible = "fsl,mpc8572-l2-cache-controller";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
cache-line-size = <32>; // 32 bytes cache-line-size = <32>; // 32 bytes
cache-size = <0x80000>; // L2, 512K cache-size = <0x100000>; // L2, 1M
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <16 2>; interrupts = <16 2>;
}; };
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -838,7 +838,7 @@ CONFIG_PHYLIB=y ...@@ -838,7 +838,7 @@ CONFIG_PHYLIB=y
# #
# MII PHY device drivers # MII PHY device drivers
# #
CONFIG_MARVELL_PHY=y # CONFIG_MARVELL_PHY is not set
# CONFIG_DAVICOM_PHY is not set # CONFIG_DAVICOM_PHY is not set
# CONFIG_QSEMI_PHY is not set # CONFIG_QSEMI_PHY is not set
# CONFIG_LXT_PHY is not set # CONFIG_LXT_PHY is not set
......
This diff is collapsed.
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.28-rc2 # Linux kernel version: 2.6.28-rc4
# Tue Oct 28 08:56:44 2008 # Fri Nov 14 09:54:44 2008
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
...@@ -500,15 +500,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 ...@@ -500,15 +500,17 @@ CONFIG_BLK_DEV_RAM_SIZE=35000
# CONFIG_BLK_DEV_XIP is not set # CONFIG_BLK_DEV_XIP is not set
# CONFIG_CDROM_PKTCDVD is not set # CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set # CONFIG_ATA_OVER_ETH is not set
# CONFIG_XILINX_SYSACE is not set CONFIG_XILINX_SYSACE=m
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_MISC_DEVICES=y CONFIG_MISC_DEVICES=y
# CONFIG_PHANTOM is not set # CONFIG_PHANTOM is not set
# CONFIG_EEPROM_93CX6 is not set # CONFIG_EEPROM_93CX6 is not set
# CONFIG_SGI_IOC4 is not set # CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set # CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set # CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_HP_ILO is not set # CONFIG_HP_ILO is not set
# CONFIG_C2PORT is not set
CONFIG_HAVE_IDE=y CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set # CONFIG_IDE is not set
...@@ -632,7 +634,13 @@ CONFIG_NETDEV_10000=y ...@@ -632,7 +634,13 @@ CONFIG_NETDEV_10000=y
# #
# Hardware I/O ports # Hardware I/O ports
# #
# CONFIG_SERIO is not set CONFIG_SERIO=m
# CONFIG_SERIO_I8042 is not set
# CONFIG_SERIO_SERPORT is not set
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_LIBPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_XILINX_XPS_PS2=m
# CONFIG_GAMEPORT is not set # CONFIG_GAMEPORT is not set
# #
...@@ -660,7 +668,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y ...@@ -660,7 +668,8 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
# #
# Non-8250 serial port support # Non-8250 serial port support
# #
# CONFIG_SERIAL_UARTLITE is not set CONFIG_SERIAL_UARTLITE=y
CONFIG_SERIAL_UARTLITE_CONSOLE=y
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_JSM is not set # CONFIG_SERIAL_JSM is not set
...@@ -756,6 +765,11 @@ CONFIG_GPIOLIB=y ...@@ -756,6 +765,11 @@ CONFIG_GPIOLIB=y
# CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_GPIO is not set
# CONFIG_GPIO_SYSFS is not set # CONFIG_GPIO_SYSFS is not set
#
# Memory mapped GPIO expanders:
#
CONFIG_GPIO_XILINX=y
# #
# I2C GPIO expanders: # I2C GPIO expanders:
# #
...@@ -776,11 +790,11 @@ CONFIG_GPIOLIB=y ...@@ -776,11 +790,11 @@ CONFIG_GPIOLIB=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_THERMAL=y CONFIG_THERMAL=y
# CONFIG_WATCHDOG is not set # CONFIG_WATCHDOG is not set
CONFIG_SSB_POSSIBLE=y
# #
# Sonics Silicon Backplane # Sonics Silicon Backplane
# #
CONFIG_SSB_POSSIBLE=y
# CONFIG_SSB is not set # CONFIG_SSB is not set
# #
...@@ -792,6 +806,7 @@ CONFIG_SSB_POSSIBLE=y ...@@ -792,6 +806,7 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_MFD_TMIO is not set # CONFIG_MFD_TMIO is not set
# CONFIG_MFD_WM8400 is not set # CONFIG_MFD_WM8400 is not set
# CONFIG_MFD_WM8350_I2C is not set # CONFIG_MFD_WM8350_I2C is not set
# CONFIG_REGULATOR is not set
# #
# Multimedia devices # Multimedia devices
...@@ -816,13 +831,65 @@ CONFIG_SSB_POSSIBLE=y ...@@ -816,13 +831,65 @@ CONFIG_SSB_POSSIBLE=y
# CONFIG_DRM is not set # CONFIG_DRM is not set
# CONFIG_VGASTATE is not set # CONFIG_VGASTATE is not set
CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_VIDEO_OUTPUT_CONTROL=m
# CONFIG_FB is not set CONFIG_FB=m
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_CFB_FILLRECT=m
CONFIG_FB_CFB_COPYAREA=m
CONFIG_FB_CFB_IMAGEBLIT=m
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_COPYAREA is not set
# CONFIG_FB_SYS_IMAGEBLIT is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_SYS_FOPS is not set
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
#
# Frame buffer hardware drivers
#
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_PM2 is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_VGA16 is not set
# CONFIG_FB_UVESA is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_RIVA is not set
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON is not set
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
# CONFIG_FB_SIS is not set
# CONFIG_FB_VIA is not set
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_KYRO is not set
# CONFIG_FB_3DFX is not set
# CONFIG_FB_VOODOO1 is not set
# CONFIG_FB_VT8623 is not set
# CONFIG_FB_TRIDENT is not set
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_IBM_GXT4500 is not set
CONFIG_FB_XILINX=m
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
# #
# Display device support # Display device support
# #
# CONFIG_DISPLAY_SUPPORT is not set # CONFIG_DISPLAY_SUPPORT is not set
# CONFIG_LOGO is not set
# CONFIG_SOUND is not set # CONFIG_SOUND is not set
CONFIG_USB_SUPPORT=y CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_HCD=y
...@@ -851,6 +918,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y ...@@ -851,6 +918,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
# CONFIG_DMADEVICES is not set # CONFIG_DMADEVICES is not set
# CONFIG_UIO is not set # CONFIG_UIO is not set
# CONFIG_STAGING is not set # CONFIG_STAGING is not set
CONFIG_STAGING_EXCLUDE_BUILD=y
# #
# File systems # File systems
...@@ -1077,10 +1145,12 @@ CONFIG_DEBUG_BUGVERBOSE=y ...@@ -1077,10 +1145,12 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_FAULT_INJECTION is not set # CONFIG_FAULT_INJECTION is not set
# CONFIG_LATENCYTOP is not set # CONFIG_LATENCYTOP is not set
CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_SYSCTL_SYSCALL_CHECK=y
CONFIG_NOP_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FTRACE=y
CONFIG_HAVE_DYNAMIC_FTRACE=y #
# CONFIG_FTRACE is not set # Tracers
#
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_SCHED_TRACER is not set # CONFIG_SCHED_TRACER is not set
# CONFIG_CONTEXT_SWITCH_TRACER is not set # CONFIG_CONTEXT_SWITCH_TRACER is not set
# CONFIG_BOOT_TRACER is not set # CONFIG_BOOT_TRACER is not set
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment