projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull motherboard into release branch
[powerpc.git]
/
arch
/
um
/
drivers
/
mconsole_kern.c
diff --git
a/arch/um/drivers/mconsole_kern.c
b/arch/um/drivers/mconsole_kern.c
index
28e3760
..
6d7173f
100644
(file)
--- a/
arch/um/drivers/mconsole_kern.c
+++ b/
arch/um/drivers/mconsole_kern.c
@@
-62,7
+62,7
@@
static void mc_work_proc(void *unused)
unsigned long flags;
while(!list_empty(&mc_requests)){
unsigned long flags;
while(!list_empty(&mc_requests)){
- local_
save_flags
(flags);
+ local_
irq_save
(flags);
req = list_entry(mc_requests.next, struct mconsole_entry,
list);
list_del(&req->list);
req = list_entry(mc_requests.next, struct mconsole_entry,
list);
list_del(&req->list);
@@
-87,7
+87,7
@@
static irqreturn_t mconsole_interrupt(int irq, void *dev_id,
if(req.cmd->context == MCONSOLE_INTR)
(*req.cmd->handler)(&req);
else {
if(req.cmd->context == MCONSOLE_INTR)
(*req.cmd->handler)(&req);
else {
- new = kmalloc(sizeof(*new), GFP_
ATOMIC
);
+ new = kmalloc(sizeof(*new), GFP_
NOWAIT
);
if(new == NULL)
mconsole_reply(&req, "Out of memory", 1, 0);
else {
if(new == NULL)
mconsole_reply(&req, "Out of memory", 1, 0);
else {
@@
-415,7
+415,6
@@
static int mem_config(char *str)
unplugged = page_address(page);
if(unplug_index == UNPLUGGED_PER_PAGE){
unplugged = page_address(page);
if(unplug_index == UNPLUGGED_PER_PAGE){
- INIT_LIST_HEAD(&unplugged->list);
list_add(&unplugged->list, &unplugged_pages);
unplug_index = 0;
}
list_add(&unplugged->list, &unplugged_pages);
unplug_index = 0;
}
@@
-616,7
+615,7
@@
static void console_write(struct console *console, const char *string,
return;
while(1){
return;
while(1){
- n = min((size_t)len, ARRAY_SIZE(console_buf) - console_index);
+ n = min((size_t)
len, ARRAY_SIZE(console_buf) - console_index);
strncpy(&console_buf[console_index], string, n);
console_index += n;
string += n;
strncpy(&console_buf[console_index], string, n);
console_index += n;
string += n;
@@
-655,7
+654,6
@@
static void with_console(struct mc_request *req, void (*proc)(void *),
struct mconsole_entry entry;
unsigned long flags;
struct mconsole_entry entry;
unsigned long flags;
- INIT_LIST_HEAD(&entry.list);
entry.request = *req;
list_add(&entry.list, &clients);
spin_lock_irqsave(&console_lock, flags);
entry.request = *req;
list_add(&entry.list, &clients);
spin_lock_irqsave(&console_lock, flags);