Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 102418
b: refs/heads/master
c: 7dd0710
h: refs/heads/master
v: v3
  • Loading branch information
Jesper Nilsson committed Jun 30, 2008
1 parent 936091f commit ec14c54
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53e43d014cb7d5a3bd53dbdbf0e74977e7dda923
refs/heads/master: 7dd071058f70d517f2d24e80cbb9d9885d565f0a
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v10/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

asflags-y += $(LINUXINCLUDE)
ccflags-y += -O2 $(LINUXINCLUDE)
ldflags-y += -T $(obj)/decompress.ld
ldflags-y += -T $(srctree)/$(obj)/decompress.ld
OBJECTS = $(obj)/head.o $(obj)/misc.o
OBJCOPYFLAGS = -O binary --remove-section=.bss

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v10/boot/rescue/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ccflags-y += -O2 $(LINUXINCLUDE)
asflags-y += $(LINUXINCLUDE)
ldflags-y += -T $(obj)/rescue.ld
ldflags-y += -T $(srctree)/$(obj)/rescue.ld
OBJCOPYFLAGS = -O binary --remove-section=.bss
obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
OBJECT := $(obj)/head.o
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v10/drivers/pcf8563.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,

if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) {
mutex_unlock(&rtc_lock);
spin_unlock(&rtc_lock);
return -EFAULT;
}

Expand Down
20 changes: 7 additions & 13 deletions trunk/arch/cris/arch-v10/kernel/debugport.c
Original file line number Diff line number Diff line change
Expand Up @@ -426,18 +426,12 @@ static int dummy_write(struct tty_struct * tty,
return count;
}

static int dummy_write_room(struct tty_struct *tty)
static int
dummy_write_room(struct tty_struct *tty)
{
return 8192;
}

static const struct tty_operations dummy_ops = {
.open = dummy_open,
.close = dummy_close,
.write = dummy_write,
.write_room = dummy_write_room,
};

void __init
init_dummy_console(void)
{
Expand All @@ -450,14 +444,14 @@ init_dummy_console(void)
dummy_driver.type = TTY_DRIVER_TYPE_SERIAL;
dummy_driver.subtype = SERIAL_TYPE_NORMAL;
dummy_driver.init_termios = tty_std_termios;
/* Normally B9600 default... */
dummy_driver.init_termios.c_cflag =
B115200 | CS8 | CREAD | HUPCL | CLOCAL;
B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
dummy_driver.init_termios.c_ispeed = 115200;
dummy_driver.init_termios.c_ospeed = 115200;

dummy_driver.ops = &dummy_ops;
dummy_driver.open = dummy_open;
dummy_driver.close = dummy_close;
dummy_driver.write = dummy_write;
dummy_driver.write_room = dummy_write_room;
if (tty_register_driver(&dummy_driver))
panic("Couldn't register dummy serial driver\n");
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v32/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch
ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch
ldflags-y += -T $(obj)/decompress.ld
ldflags-y += -T $(srctree)/$(obj)/decompress.ld
OBJECTS = $(obj)/head.o $(obj)/misc.o
OBJCOPYFLAGS = -O binary --remove-section=.bss

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v32/boot/rescue/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \
-I $(srctree)/include/asm/arch
asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch
LD = gcc-cris -mlinux -march=v32 -nostdlib
ldflags-y += -T $(obj)/rescue.ld
ldflags-y += -T $(srctree)/$(obj)/rescue.ld
LDPOSTFLAGS = -lgcc
OBJCOPYFLAGS = -O binary --remove-section=.bss
obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/cris/arch-v32/drivers/pcf8563.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,

if (copy_to_user((struct rtc_time *) arg, &tm,
sizeof tm)) {
mutex_unlock(&rtc_lock);
spin_unlock(&rtc_lock);
return -EFAULT;
}

Expand Down

0 comments on commit ec14c54

Please sign in to comment.