diff options
Diffstat (limited to 'arch/xtensa')
-rw-r--r-- | arch/xtensa/Kconfig | 18 | ||||
-rw-r--r-- | arch/xtensa/include/asm/Kbuild | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/elf.h | 3 | ||||
-rw-r--r-- | arch/xtensa/include/uapi/asm/Kbuild | 3 | ||||
-rw-r--r-- | arch/xtensa/kernel/pci.c | 8 | ||||
-rw-r--r-- | arch/xtensa/kernel/process.c | 3 | ||||
-rw-r--r-- | arch/xtensa/platforms/iss/console.c | 1 |
7 files changed, 11 insertions, 27 deletions
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index cebbcfbe9d6..cdcb48adee4 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig | |||
@@ -176,24 +176,6 @@ config CMDLINE | |||
176 | 176 | ||
177 | source "mm/Kconfig" | 177 | source "mm/Kconfig" |
178 | 178 | ||
179 | config HOTPLUG | ||
180 | bool "Support for hot-pluggable devices" | ||
181 | help | ||
182 | Say Y here if you want to plug devices into your computer while | ||
183 | the system is running, and be able to use them quickly. In many | ||
184 | cases, the devices can likewise be unplugged at any time too. | ||
185 | |||
186 | One well known example of this is PCMCIA- or PC-cards, credit-card | ||
187 | size devices such as network cards, modems or hard drives which are | ||
188 | plugged into slots found on all modern laptop computers. Another | ||
189 | example, used on modern desktops as well as laptops, is USB. | ||
190 | |||
191 | Enable HOTPLUG and build a modular kernel. Get agent software | ||
192 | (from <http://linux-hotplug.sourceforge.net/>) and install it. | ||
193 | Then your kernel will automatically call out to a user mode "policy | ||
194 | agent" (/sbin/hotplug) to load modules and set up software needed | ||
195 | to use devices as you hotplug them. | ||
196 | |||
197 | source "drivers/pcmcia/Kconfig" | 179 | source "drivers/pcmcia/Kconfig" |
198 | 180 | ||
199 | source "drivers/pci/hotplug/Kconfig" | 181 | source "drivers/pci/hotplug/Kconfig" |
diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild index c68e1680da0..0d20f5526dd 100644 --- a/arch/xtensa/include/asm/Kbuild +++ b/arch/xtensa/include/asm/Kbuild | |||
@@ -1 +1,3 @@ | |||
1 | include include/asm-generic/Kbuild.asm | 1 | include include/asm-generic/Kbuild.asm |
2 | |||
3 | generic-y += clkdev.h | ||
diff --git a/arch/xtensa/include/asm/elf.h b/arch/xtensa/include/asm/elf.h index 6e65eadaae1..5293312bc6a 100644 --- a/arch/xtensa/include/asm/elf.h +++ b/arch/xtensa/include/asm/elf.h | |||
@@ -189,7 +189,8 @@ typedef struct { | |||
189 | #endif | 189 | #endif |
190 | } elf_xtregs_t; | 190 | } elf_xtregs_t; |
191 | 191 | ||
192 | #define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT) | 192 | #define SET_PERSONALITY(ex) \ |
193 | set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK))) | ||
193 | 194 | ||
194 | struct task_struct; | 195 | struct task_struct; |
195 | 196 | ||
diff --git a/arch/xtensa/include/uapi/asm/Kbuild b/arch/xtensa/include/uapi/asm/Kbuild new file mode 100644 index 00000000000..baebb3da1d4 --- /dev/null +++ b/arch/xtensa/include/uapi/asm/Kbuild | |||
@@ -0,0 +1,3 @@ | |||
1 | # UAPI Header export list | ||
2 | include include/uapi/asm-generic/Kbuild.asm | ||
3 | |||
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index 43e9fdce40d..126c1883940 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c | |||
@@ -210,14 +210,6 @@ void pcibios_set_master(struct pci_dev *dev) | |||
210 | /* No special bus mastering setup handling */ | 210 | /* No special bus mastering setup handling */ |
211 | } | 211 | } |
212 | 212 | ||
213 | /* the next one is stolen from the alpha port... */ | ||
214 | |||
215 | void __init | ||
216 | pcibios_update_irq(struct pci_dev *dev, int irq) | ||
217 | { | ||
218 | pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); | ||
219 | } | ||
220 | |||
221 | int pcibios_enable_device(struct pci_dev *dev, int mask) | 213 | int pcibios_enable_device(struct pci_dev *dev, int mask) |
222 | { | 214 | { |
223 | u16 cmd, old_cmd; | 215 | u16 cmd, old_cmd; |
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c index 2c8d6a3d250..bc44311aa18 100644 --- a/arch/xtensa/kernel/process.c +++ b/arch/xtensa/kernel/process.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/mqueue.h> | 31 | #include <linux/mqueue.h> |
32 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
33 | #include <linux/slab.h> | 33 | #include <linux/slab.h> |
34 | #include <linux/rcupdate.h> | ||
34 | 35 | ||
35 | #include <asm/pgtable.h> | 36 | #include <asm/pgtable.h> |
36 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
@@ -110,8 +111,10 @@ void cpu_idle(void) | |||
110 | 111 | ||
111 | /* endless idle loop with no priority at all */ | 112 | /* endless idle loop with no priority at all */ |
112 | while (1) { | 113 | while (1) { |
114 | rcu_idle_enter(); | ||
113 | while (!need_resched()) | 115 | while (!need_resched()) |
114 | platform_idle(); | 116 | platform_idle(); |
117 | rcu_idle_exit(); | ||
115 | schedule_preempt_disabled(); | 118 | schedule_preempt_disabled(); |
116 | } | 119 | } |
117 | } | 120 | } |
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 3fc15229249..8ab47edd7c8 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c | |||
@@ -210,6 +210,7 @@ int __init rs_init(void) | |||
210 | serial_driver->flags = TTY_DRIVER_REAL_RAW; | 210 | serial_driver->flags = TTY_DRIVER_REAL_RAW; |
211 | 211 | ||
212 | tty_set_operations(serial_driver, &serial_ops); | 212 | tty_set_operations(serial_driver, &serial_ops); |
213 | tty_port_link_device(&serial_port, serial_driver, 0); | ||
213 | 214 | ||
214 | if (tty_register_driver(serial_driver)) | 215 | if (tty_register_driver(serial_driver)) |
215 | panic("Couldn't register serial driver\n"); | 216 | panic("Couldn't register serial driver\n"); |