Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-18 02:46:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] uml: Formatting changes

Browse Source 
This patch makes a bunch of non-functional changes -
    return(foo); becomes return foo;
    some statements are broken across lines for readability
    some trailing whitespace is cleaned up
    open_one_chan took four arguments, three of which could be
       deduced from the first.  Accordingly, they were eliminated.
    some examples of "} else {" had a newline added
    some whitespace cleanup in the indentation
    lines_init got some control flow cleanup
    some long lines were broken
    removed another emacs-specific C formatting comment

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike 2006-01-06 00:18:50 -08:00 committed by Linus Torvalds
parent 1b57e9c278
commit d50084a299
8 changed files with 358 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
arch/um/drivers/chan_kern.c
View File

@ -58,7 +58,7 @@ static void *not_configged_init(char *str, int device, struct chan_opts *opts)
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(NULL); return NULL;
} }
static int not_configged_open(int input, int output, int primary, void *data, static int not_configged_open(int input, int output, int primary, void *data,
@ -66,7 +66,7 @@ static int not_configged_open(int input, int output, int primary, void *data,
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(-ENODEV); return -ENODEV;
} }
static void not_configged_close(int fd, void *data) static void not_configged_close(int fd, void *data)
@ -79,21 +79,21 @@ static int not_configged_read(int fd, char *c_out, void *data)
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(-EIO); return -EIO;
} }
static int not_configged_write(int fd, const char *buf, int len, void *data) static int not_configged_write(int fd, const char *buf, int len, void *data)
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(-EIO); return -EIO;
} }
static int not_configged_console_write(int fd, const char *buf, int len) static int not_configged_console_write(int fd, const char *buf, int len)
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(-EIO); return -EIO;
} }
static int not_configged_window_size(int fd, void *data, unsigned short *rows, static int not_configged_window_size(int fd, void *data, unsigned short *rows,
@ -101,7 +101,7 @@ static int not_configged_window_size(int fd, void *data, unsigned short *rows,
{ {
my_puts("Using a channel type which is configured out of " my_puts("Using a channel type which is configured out of "
"UML\n"); "UML\n");
return(-ENODEV); return -ENODEV;
} }
static void not_configged_free(void *data) static void not_configged_free(void *data)
@ -135,17 +135,17 @@ int generic_read(int fd, char *c_out, void *unused)
n = os_read_file(fd, c_out, sizeof(*c_out)); n = os_read_file(fd, c_out, sizeof(*c_out));
if(n == -EAGAIN) if(n == -EAGAIN)
return(0); return 0;
else if(n == 0) else if(n == 0)
return(-EIO); return -EIO;
return(n); return n;
} }
/* XXX Trivial wrapper around os_write_file */ /* XXX Trivial wrapper around os_write_file */
int generic_write(int fd, const char *buf, int n, void *unused) int generic_write(int fd, const char *buf, int n, void *unused)
{ {
return(os_write_file(fd, buf, n)); return os_write_file(fd, buf, n);
} }
int generic_window_size(int fd, void *unused, unsigned short *rows_out, int generic_window_size(int fd, void *unused, unsigned short *rows_out,
@ -156,14 +156,14 @@ int generic_window_size(int fd, void *unused, unsigned short *rows_out,
ret = os_window_size(fd, &rows, &cols); ret = os_window_size(fd, &rows, &cols);
if(ret < 0) if(ret < 0)
return(ret); return ret;
ret = ((*rows_out != rows) || (*cols_out != cols)); ret = ((*rows_out != rows) || (*cols_out != cols));
*rows_out = rows; *rows_out = rows;
*cols_out = cols; *cols_out = cols;
return(ret); return ret;
} }
void generic_free(void *data) void generic_free(void *data)
@ -192,19 +192,23 @@ static void tty_receive_char(struct tty_struct *tty, char ch)
tty_insert_flip_char(tty, ch, TTY_NORMAL); tty_insert_flip_char(tty, ch, TTY_NORMAL);
} }
static int open_one_chan(struct chan *chan, int input, int output, int primary) static int open_one_chan(struct chan *chan)
{ {
int fd; int fd;
if(chan->opened) return(0); if(chan->opened)
if(chan->ops->open == NULL) fd = 0; return 0;
else fd = (*chan->ops->open)(input, output, primary, chan->data,
&chan->dev); if(chan->ops->open == NULL)
if(fd < 0) return(fd); fd = 0;
else fd = (*chan->ops->open)(chan->input, chan->output, chan->primary,
chan->data, &chan->dev);
if(fd < 0)
return fd;
chan->fd = fd; chan->fd = fd;
chan->opened = 1; chan->opened = 1;
return(0); return 0;
} }
int open_chan(struct list_head *chans) int open_chan(struct list_head *chans)
@ -215,11 +219,11 @@ int open_chan(struct list_head *chans)
list_for_each(ele, chans){ list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list); chan = list_entry(ele, struct chan, list);
ret = open_one_chan(chan, chan->input, chan->output, ret = open_one_chan(chan);
chan->primary); if(chan->primary)
if(chan->primary) err = ret; err = ret;
} }
return(err); return err;
} }
void chan_enable_winch(struct list_head *chans, struct tty_struct *tty) void chan_enable_winch(struct list_head *chans, struct tty_struct *tty)
@ -285,7 +289,7 @@ int write_chan(struct list_head *chans, const char *buf, int len,
reactivate_fd(chan->fd, write_irq); reactivate_fd(chan->fd, write_irq);
} }
} }
return(ret); return ret;
} }
int console_write_chan(struct list_head *chans, const char *buf, int len) int console_write_chan(struct list_head *chans, const char *buf, int len)
@ -301,10 +305,11 @@ int console_write_chan(struct list_head *chans, const char *buf, int len)
n = chan->ops->console_write(chan->fd, buf, len); n = chan->ops->console_write(chan->fd, buf, len);
if(chan->primary) ret = n; if(chan->primary) ret = n;
} }
return(ret); return ret;
} }
int console_open_chan(struct line *line, struct console *co, struct chan_opts *opts) int console_open_chan(struct line *line, struct console *co,
struct chan_opts *opts)
{ {
if (!list_empty(&line->chan_list)) if (!list_empty(&line->chan_list))
return 0; return 0;
@ -327,12 +332,13 @@ int chan_window_size(struct list_head *chans, unsigned short *rows_out,
list_for_each(ele, chans){ list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list); chan = list_entry(ele, struct chan, list);
if(chan->primary){ if(chan->primary){
if(chan->ops->window_size == NULL) return(0); if(chan->ops->window_size == NULL)
return(chan->ops->window_size(chan->fd, chan->data, return 0;
rows_out, cols_out)); return chan->ops->window_size(chan->fd, chan->data,
rows_out, cols_out);
} }
} }
return(0); return 0;
} }
void free_one_chan(struct chan *chan) void free_one_chan(struct chan *chan)
@ -363,20 +369,20 @@ static int one_chan_config_string(struct chan *chan, char *str, int size,
if(chan == NULL){ if(chan == NULL){
CONFIG_CHUNK(str, size, n, "none", 1); CONFIG_CHUNK(str, size, n, "none", 1);
return(n); return n;
} }
CONFIG_CHUNK(str, size, n, chan->ops->type, 0); CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
if(chan->dev == NULL){ if(chan->dev == NULL){
CONFIG_CHUNK(str, size, n, "", 1); CONFIG_CHUNK(str, size, n, "", 1);
return(n); return n;
} }
CONFIG_CHUNK(str, size, n, ":", 0); CONFIG_CHUNK(str, size, n, ":", 0);
CONFIG_CHUNK(str, size, n, chan->dev, 0); CONFIG_CHUNK(str, size, n, chan->dev, 0);
return(n); return n;
} }
static int chan_pair_config_string(struct chan *in, struct chan *out, static int chan_pair_config_string(struct chan *in, struct chan *out,
@ -390,7 +396,7 @@ static int chan_pair_config_string(struct chan *in, struct chan *out,
if(in == out){ if(in == out){
CONFIG_CHUNK(str, size, n, "", 1); CONFIG_CHUNK(str, size, n, "", 1);
return(n); return n;
} }
CONFIG_CHUNK(str, size, n, ",", 1); CONFIG_CHUNK(str, size, n, ",", 1);
@ -399,7 +405,7 @@ static int chan_pair_config_string(struct chan *in, struct chan *out,
size -= n; size -= n;
CONFIG_CHUNK(str, size, n, "", 1); CONFIG_CHUNK(str, size, n, "", 1);
return(n); return n;
} }
int chan_config_string(struct list_head *chans, char *str, int size, int chan_config_string(struct list_head *chans, char *str, int size,
@ -418,7 +424,7 @@ int chan_config_string(struct list_head *chans, char *str, int size,
out = chan; out = chan;
} }
return(chan_pair_config_string(in, out, str, size, error_out)); return chan_pair_config_string(in, out, str, size, error_out);
} }
struct chan_type { struct chan_type {
@ -484,14 +490,17 @@ static struct chan *parse_chan(char *str, int pri, int device,
if(ops == NULL){ if(ops == NULL){
my_printf("parse_chan couldn't parse \"%s\"\n", my_printf("parse_chan couldn't parse \"%s\"\n",
str); str);
return(NULL); return NULL;
} }
if(ops->init == NULL) return(NULL); if(ops->init == NULL)
return NULL;
data = (*ops->init)(str, device, opts); data = (*ops->init)(str, device, opts);
if(data == NULL) return(NULL); if(data == NULL)
return NULL;
chan = kmalloc(sizeof(*chan), GFP_ATOMIC); chan = kmalloc(sizeof(*chan), GFP_ATOMIC);
if(chan == NULL) return(NULL); if(chan == NULL)
return NULL;
*chan = ((struct chan) { .list = LIST_HEAD_INIT(chan->list), *chan = ((struct chan) { .list = LIST_HEAD_INIT(chan->list),
.primary = 1, .primary = 1,
.input = 0, .input = 0,
@ -501,7 +510,7 @@ static struct chan *parse_chan(char *str, int pri, int device,
.pri = pri, .pri = pri,
.ops = ops, .ops = ops,
.data = data }); .data = data });
return(chan); return chan;
} }
int parse_chan_pair(char *str, struct list_head *chans, int pri, int device, int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
@ -512,7 +521,8 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
if(!list_empty(chans)){ if(!list_empty(chans)){
chan = list_entry(chans->next, struct chan, list); chan = list_entry(chans->next, struct chan, list);
if(chan->pri >= pri) return(0); if(chan->pri >= pri)
return 0;
free_chan(chans); free_chan(chans);
INIT_LIST_HEAD(chans); INIT_LIST_HEAD(chans);
} }
@ -523,23 +533,29 @@ int parse_chan_pair(char *str, struct list_head *chans, int pri, int device,
*out = '\0'; *out = '\0';
out++; out++;
new = parse_chan(in, pri, device, opts); new = parse_chan(in, pri, device, opts);
if(new == NULL) return(-1); if(new == NULL)
return -1;
new->input = 1; new->input = 1;
list_add(&new->list, chans); list_add(&new->list, chans);
new = parse_chan(out, pri, device, opts); new = parse_chan(out, pri, device, opts);
if(new == NULL) return(-1); if(new == NULL)
return -1;
list_add(&new->list, chans); list_add(&new->list, chans);
new->output = 1; new->output = 1;
} }
else { else {
new = parse_chan(str, pri, device, opts); new = parse_chan(str, pri, device, opts);
if(new == NULL) return(-1); if(new == NULL)
return -1;
list_add(&new->list, chans); list_add(&new->list, chans);
new->input = 1; new->input = 1;
new->output = 1; new->output = 1;
} }
return(0); return 0;
} }
int chan_out_fd(struct list_head *chans) int chan_out_fd(struct list_head *chans)
@ -550,9 +566,9 @@ int chan_out_fd(struct list_head *chans)
list_for_each(ele, chans){ list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list); chan = list_entry(ele, struct chan, list);
if(chan->primary && chan->output) if(chan->primary && chan->output)
return(chan->fd); return chan->fd;
} }
return(-1); return -1;
} }
void chan_interrupt(struct list_head *chans, struct work_struct *task, void chan_interrupt(struct list_head *chans, struct work_struct *task,

23
arch/um/drivers/line.c
View File

@ -124,7 +124,8 @@ static int buffer_data(struct line *line, const char *buf, int len)
if (len < end){ if (len < end){
memcpy(line->tail, buf, len); memcpy(line->tail, buf, len);
line->tail += len; line->tail += len;
} else { }
else {
/* The circular buffer is wrapping */ /* The circular buffer is wrapping */
memcpy(line->tail, buf, end); memcpy(line->tail, buf, end);
buf += end; buf += end;
@ -512,7 +513,8 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
/* We said con=/ssl= instead of con#=, so we are configuring all /* We said con=/ssl= instead of con#=, so we are configuring all
* consoles at once.*/ * consoles at once.*/
n = -1; n = -1;
} else { }
else {
n = simple_strtoul(init, &end, 0); n = simple_strtoul(init, &end, 0);
if(*end != '='){ if(*end != '='){
printk(KERN_ERR "line_setup failed to parse \"%s\"\n", printk(KERN_ERR "line_setup failed to parse \"%s\"\n",
@ -527,7 +529,8 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
printk("line_setup - %d out of range ((0 ... %d) allowed)\n", printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
n, num - 1); n, num - 1);
return 0; return 0;
} else if (n >= 0){ }
else if (n >= 0){
if (lines[n].count > 0) { if (lines[n].count > 0) {
printk("line_setup - device %d is open\n", n); printk("line_setup - device %d is open\n", n);
return 0; return 0;
@ -541,11 +544,13 @@ int line_setup(struct line *lines, unsigned int num, char *init, int all_allowed
lines[n].valid = 1; lines[n].valid = 1;
} }
} }
} else if(!all_allowed){ }
else if(!all_allowed){
printk("line_setup - can't configure all devices from " printk("line_setup - can't configure all devices from "
"mconsole\n"); "mconsole\n");
return 0; return 0;
} else { }
else {
for(i = 0; i < num; i++){ for(i = 0; i < num; i++){
if(lines[i].init_pri <= INIT_ALL){ if(lines[i].init_pri <= INIT_ALL){
lines[i].init_pri = INIT_ALL; lines[i].init_pri = INIT_ALL;
@ -677,13 +682,14 @@ void lines_init(struct line *lines, int nlines)
line = &lines[i]; line = &lines[i];
INIT_LIST_HEAD(&line->chan_list); INIT_LIST_HEAD(&line->chan_list);
spin_lock_init(&line->lock); spin_lock_init(&line->lock);
if(line->init_str != NULL){ if(line->init_str == NULL)
continue;
line->init_str = kstrdup(line->init_str, GFP_KERNEL); line->init_str = kstrdup(line->init_str, GFP_KERNEL);
if(line->init_str == NULL) if(line->init_str == NULL)
printk("lines_init - kstrdup returned NULL\n"); printk("lines_init - kstrdup returned NULL\n");
} }
} }
}
struct winch { struct winch {
struct list_head list; struct list_head list;
@ -717,8 +723,7 @@ irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
tty = winch->tty; tty = winch->tty;
if (tty != NULL) { if (tty != NULL) {
line = tty->driver_data; line = tty->driver_data;
chan_window_size(&line->chan_list, chan_window_size(&line->chan_list, &tty->winsize.ws_row,
&tty->winsize.ws_row,
&tty->winsize.ws_col); &tty->winsize.ws_col);
kill_pg(tty->pgrp, SIGWINCH, 1); kill_pg(tty->pgrp, SIGWINCH, 1);
} }

1
arch/um/drivers/mconsole_kern.c
View File

@ -389,7 +389,6 @@ static void mconsole_get_config(int (*get_config)(char *, char *, int,
out: out:
if(buf != default_buf) if(buf != default_buf)
kfree(buf); kfree(buf);
} }
void mconsole_config(struct mc_request *req) void mconsole_config(struct mc_request *req)

17
arch/um/drivers/ssl.c
View File

@ -84,15 +84,15 @@ static struct lines lines = LINES_INIT(NR_PORTS);
static int ssl_config(char *str) static int ssl_config(char *str)
{ {
return(line_config(serial_lines, return line_config(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), str)); sizeof(serial_lines)/sizeof(serial_lines[0]), str);
} }
static int ssl_get_config(char *dev, char *str, int size, char **error_out) static int ssl_get_config(char *dev, char *str, int size, char **error_out)
{ {
return(line_get_config(dev, serial_lines, return line_get_config(dev, serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), sizeof(serial_lines)/sizeof(serial_lines[0]),
str, size, error_out)); str, size, error_out);
} }
static int ssl_remove(int n) static int ssl_remove(int n)
@ -202,7 +202,8 @@ int ssl_init(void)
printk(KERN_INFO "Initializing software serial port version %d\n", printk(KERN_INFO "Initializing software serial port version %d\n",
ssl_version); ssl_version);
ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops, ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops,
serial_lines, ARRAY_SIZE(serial_lines)); serial_lines,
ARRAY_SIZE(serial_lines));
lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0])); lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]));
@ -212,7 +213,7 @@ int ssl_init(void)
ssl_init_done = 1; ssl_init_done = 1;
register_console(&ssl_cons); register_console(&ssl_cons);
return(0); return 0;
} }
late_initcall(ssl_init); late_initcall(ssl_init);
@ -227,9 +228,9 @@ __uml_exitcall(ssl_exit);
static int ssl_chan_setup(char *str) static int ssl_chan_setup(char *str)
{ {
return(line_setup(serial_lines, return line_setup(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), sizeof(serial_lines)/sizeof(serial_lines[0]),
str, 1)); str, 1);
} }
__setup("ssl", ssl_chan_setup); __setup("ssl", ssl_chan_setup);

12
arch/um/drivers/stdio_console.c
View File

@ -91,13 +91,13 @@ struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver),
static int con_config(char *str) static int con_config(char *str)
{ {
return(line_config(vts, sizeof(vts)/sizeof(vts[0]), str)); return line_config(vts, sizeof(vts)/sizeof(vts[0]), str);
} }
static int con_get_config(char *dev, char *str, int size, char **error_out) static int con_get_config(char *dev, char *str, int size, char **error_out)
{ {
return(line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str, return line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,
size, error_out)); size, error_out);
} }
static int con_remove(int n) static int con_remove(int n)
@ -166,7 +166,7 @@ int stdio_init(void)
console_driver = line_register_devfs(&console_lines, &driver, console_driver = line_register_devfs(&console_lines, &driver,
&console_ops, vts, &console_ops, vts,
ARRAY_SIZE(vts)); ARRAY_SIZE(vts));
if (NULL == console_driver) if (console_driver == NULL)
return -1; return -1;
printk(KERN_INFO "Initialized stdio console driver\n"); printk(KERN_INFO "Initialized stdio console driver\n");
@ -178,7 +178,7 @@ int stdio_init(void)
con_init_done = 1; con_init_done = 1;
register_console(&stdiocons); register_console(&stdiocons);
return(0); return 0;
} }
late_initcall(stdio_init); late_initcall(stdio_init);
@ -192,7 +192,7 @@ __uml_exitcall(console_exit);
static int console_chan_setup(char *str) static int console_chan_setup(char *str)
{ {
return(line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1)); return line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);
} }
__setup("con", console_chan_setup); __setup("con", console_chan_setup);
__channel_help(console_chan_setup, "con"); __channel_help(console_chan_setup, "con");

11
arch/um/include/chan_kern.h
View File

@ -47,14 +47,3 @@ extern int chan_config_string(struct list_head *chans, char *str, int size,
char **error_out); char **error_out);
#endif #endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/

12
arch/um/include/line.h
View File

@ -78,7 +78,8 @@ extern int line_open(struct line *lines, struct tty_struct *tty,
struct chan_opts *opts); struct chan_opts *opts);
extern int line_setup(struct line *lines, unsigned int sizeof_lines, char *init, extern int line_setup(struct line *lines, unsigned int sizeof_lines, char *init,
int all_allowed); int all_allowed);
extern int line_write(struct tty_struct *tty, const unsigned char *buf, int len); extern int line_write(struct tty_struct *tty, const unsigned char *buf,
int len);
extern void line_put_char(struct tty_struct *tty, unsigned char ch); extern void line_put_char(struct tty_struct *tty, unsigned char ch);
extern void line_set_termios(struct tty_struct *tty, struct termios * old); extern void line_set_termios(struct tty_struct *tty, struct termios * old);
extern int line_chars_in_buffer(struct tty_struct *tty); extern int line_chars_in_buffer(struct tty_struct *tty);
@ -89,7 +90,8 @@ extern int line_ioctl(struct tty_struct *tty, struct file * file,
unsigned int cmd, unsigned long arg); unsigned int cmd, unsigned long arg);
extern char *add_xterm_umid(char *base); extern char *add_xterm_umid(char *base);
extern int line_setup_irq(int fd, int input, int output, struct tty_struct *tty); extern int line_setup_irq(int fd, int input, int output,
struct tty_struct *tty);
extern void line_close_chan(struct line *line); extern void line_close_chan(struct line *line);
extern void line_disable(struct tty_struct *tty, int current_irq); extern void line_disable(struct tty_struct *tty, int current_irq);
extern struct tty_driver * line_register_devfs(struct lines *set, extern struct tty_driver * line_register_devfs(struct lines *set,
@ -100,10 +102,12 @@ extern struct tty_driver * line_register_devfs(struct lines *set,
extern void lines_init(struct line *lines, int nlines); extern void lines_init(struct line *lines, int nlines);
extern void close_lines(struct line *lines, int nlines); extern void close_lines(struct line *lines, int nlines);
extern int line_config(struct line *lines, unsigned int sizeof_lines, char *str); extern int line_config(struct line *lines, unsigned int sizeof_lines,
char *str);
extern int line_id(char **str, int *start_out, int *end_out); extern int line_id(char **str, int *start_out, int *end_out);
extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n); extern int line_remove(struct line *lines, unsigned int sizeof_lines, int n);
extern int line_get_config(char *dev, struct line *lines, unsigned int sizeof_lines, char *str, extern int line_get_config(char *dev, struct line *lines,
unsigned int sizeof_lines, char *str,
int size, char **error_out); int size, char **error_out);
#endif #endif

3
arch/um/os-Linux/aio.c
View File

@ -332,8 +332,7 @@ static int init_aio(void)
{ {
int err; int err;
CHOOSE_MODE(({ CHOOSE_MODE(({ if(!aio_24){
if(!aio_24){
printk("Disabling 2.6 AIO in tt mode\n"); printk("Disabling 2.6 AIO in tt mode\n");
aio_24 = 1; aio_24 = 1;
} }), (void) 0); } }), (void) 0);