TTY rename for .37-rc1
Subsystems (2)
PATCH 1/1 TTY rename for .37-rc1
Now that .37-rc1 is out, we wanted to rename some of the drivers/char tty core files and move them to drivers/tty/ I waited until after .37-rc1 to do this as it made it easier for everyone merging prior to this, but if you feel this should wait until .38, that's fine, I'll keep this around until then.
This has been discussed and agreed apon for a number of months now. The larger goal of moving some of the serial drivers around will happen for .38, as it's a bigger job than this at the moment.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/tty-2.6.git/
Patches will be sent to the linux-kernel mailing list, if anyone wants to see them.
thanks,
greg k-h
------------
drivers/Makefile | 1 +
drivers/char/Makefile | 44 +-------------------------
drivers/tty/Makefile | 11 ++++++
drivers/{char => tty}/n_gsm.c | 0
drivers/{char => tty}/n_hdlc.c | 0
drivers/{char => tty}/n_r3964.c | 0
drivers/{char => tty}/n_tty.c | 0
drivers/{char => tty}/pty.c | 0
drivers/{char => tty}/sysrq.c | 0
drivers/{char => tty}/tty_audit.c | 0
drivers/{char => tty}/tty_buffer.c | 0
drivers/{char => tty}/tty_io.c | 0
drivers/{char => tty}/tty_ioctl.c | 0
drivers/{char => tty}/tty_ldisc.c | 0
drivers/{char => tty}/tty_mutex.c | 0
drivers/{char => tty}/tty_port.c | 0
drivers/{char => tty/vt}/.gitignore | 0
drivers/tty/vt/Makefile | 34 ++++++++++++++++++++
drivers/{char => tty/vt}/consolemap.c | 0
drivers/{char => tty/vt}/cp437.uni | 0
drivers/{char => tty/vt}/defkeymap.c_shipped | 0
drivers/{char => tty/vt}/defkeymap.map | 0
drivers/{char => tty/vt}/keyboard.c | 0
drivers/{char => tty/vt}/selection.c | 0
drivers/{char => tty/vt}/vc_screen.c | 0
drivers/{char => tty/vt}/vt.c | 0
drivers/{char => tty/vt}/vt_ioctl.c | 0
27 files changed, 47 insertions(+), 43 deletions(-)
create mode 100644 drivers/tty/Makefile
rename drivers/{char => tty}/n_gsm.c (100%)
rename drivers/{char => tty}/n_hdlc.c (100%)
rename drivers/{char => tty}/n_r3964.c (100%)
rename drivers/{char => tty}/n_tty.c (100%)
rename drivers/{char => tty}/pty.c (100%)
rename drivers/{char => tty}/sysrq.c (100%)
rename drivers/{char => tty}/tty_audit.c (100%)
rename drivers/{char => tty}/tty_buffer.c (100%)
rename drivers/{char => tty}/tty_io.c (100%)
rename drivers/{char => tty}/tty_ioctl.c (100%)
rename drivers/{char => tty}/tty_ldisc.c (100%)
rename drivers/{char => tty}/tty_mutex.c (100%)
rename drivers/{char => tty}/tty_port.c (100%)
rename drivers/{char => tty/vt}/.gitignore (100%)
create mode 100644 drivers/tty/vt/Makefile
rename drivers/{char => tty/vt}/consolemap.c (100%)
rename drivers/{char => tty/vt}/cp437.uni (100%)
rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%)
rename drivers/{char => tty/vt}/defkeymap.map (100%)
rename drivers/{char => tty/vt}/keyboard.c (100%)
rename drivers/{char => tty/vt}/selection.c (100%)
rename drivers/{char => tty/vt}/vc_screen.c (100%)
rename drivers/{char => tty/vt}/vt.c (100%)
rename drivers/{char => tty/vt}/vt_ioctl.c (100%)------------------
Greg Kroah-Hartman (3):
TTY: create drivers/tty and move the tty core files there
TTY: create drivers/tty/vt and move the vt code there
TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
PATCH 1/3 TTY: create drivers/tty and move the tty core files there
The tty code should be in its own subdirectory and not in the char driver with all of the cruft that is currently there.
Based on work done by Arnd Bergmann <[email protected]>
---
drivers/Makefile | 1 +
drivers/char/Makefile | 11 +----------
drivers/tty/Makefile | 9 +++++++++
drivers/{char => tty}/n_gsm.c | 0
drivers/{char => tty}/n_hdlc.c | 0
drivers/{char => tty}/n_r3964.c | 0
drivers/{char => tty}/n_tty.c | 0
drivers/{char => tty}/pty.c | 0
drivers/{char => tty}/sysrq.c | 0
drivers/{char => tty}/tty_audit.c | 0
drivers/{char => tty}/tty_buffer.c | 0
drivers/{char => tty}/tty_io.c | 0
drivers/{char => tty}/tty_ioctl.c | 0
drivers/{char => tty}/tty_ldisc.c | 0
drivers/{char => tty}/tty_mutex.c | 0
drivers/{char => tty}/tty_port.c | 0
16 files changed, 11 insertions(+), 10 deletions(-)
create mode 100644 drivers/tty/Makefile
rename drivers/{char => tty}/n_gsm.c (100%)
rename drivers/{char => tty}/n_hdlc.c (100%)
rename drivers/{char => tty}/n_r3964.c (100%)
rename drivers/{char => tty}/n_tty.c (100%)
rename drivers/{char => tty}/pty.c (100%)
rename drivers/{char => tty}/sysrq.c (100%)
rename drivers/{char => tty}/tty_audit.c (100%)
rename drivers/{char => tty}/tty_buffer.c (100%)
rename drivers/{char => tty}/tty_io.c (100%)
rename drivers/{char => tty}/tty_ioctl.c (100%)
rename drivers/{char => tty}/tty_ldisc.c (100%)
rename drivers/{char => tty}/tty_mutex.c (100%)
rename drivers/{char => tty}/tty_port.c (100%)drivers/Makefile +1 -0
@@ -26,6 +26,7 @@ obj-$(CONFIG_REGULATOR) += regulator/ # char/ comes before serial/ etc so that the VT console is the boot-time # default. +obj-y += tty/ obj-y += char/ # gpu/ comes after char for AGP vs DRM startup
drivers/char/Makefile +1 -10
@@ -7,19 +7,13 @@ # FONTMAPFILE = cp437.uni -obj-y += mem.o random.o tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o tty_buffer.o tty_port.o - -obj-y += tty_mutex.o -obj-$(CONFIG_LEGACY_PTYS) += pty.o -obj-$(CONFIG_UNIX98_PTYS) += pty.o +obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o -obj-$(CONFIG_AUDIT) += tty_audit.o -obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
@@ -41,8 +35,6 @@ obj-$(CONFIG_ISI) += isicom.o obj-$(CONFIG_SYNCLINK) += synclink.o obj-$(CONFIG_SYNCLINKMP) += synclinkmp.o obj-$(CONFIG_SYNCLINK_GT) += synclink_gt.o -obj-$(CONFIG_N_HDLC) += n_hdlc.o -obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o
@@ -74,7 +66,6 @@ obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_APM_EMULATION) += apm-emulation.o obj-$(CONFIG_DTLK) += dtlk.o -obj-$(CONFIG_R3964) += n_r3964.o obj-$(CONFIG_APPLICOM) += applicom.o obj-$(CONFIG_SONYPI) += sonypi.o obj-$(CONFIG_RTC) += rtc.o
drivers/tty/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +obj-y += tty_io.o n_tty.o tty_ioctl.o tty_ldisc.o \ + tty_buffer.o tty_port.o tty_mutex.o +obj-$(CONFIG_LEGACY_PTYS) += pty.o +obj-$(CONFIG_UNIX98_PTYS) += pty.o +obj-$(CONFIG_AUDIT) += tty_audit.o +obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o +obj-$(CONFIG_N_HDLC) += n_hdlc.o +obj-$(CONFIG_N_GSM) += n_gsm.o +obj-$(CONFIG_R3964) += n_r3964.o
drivers/tty/n_gsm.c renamed from drivers/char/n_gsm.c +0 -0
drivers/tty/n_hdlc.c renamed from drivers/char/n_hdlc.c +0 -0
drivers/tty/n_r3964.c renamed from drivers/char/n_r3964.c +0 -0
drivers/tty/n_tty.c renamed from drivers/char/n_tty.c +0 -0
drivers/tty/pty.c renamed from drivers/char/pty.c +0 -0
drivers/tty/sysrq.c renamed from drivers/char/sysrq.c +0 -0
drivers/tty/tty_audit.c renamed from drivers/char/tty_audit.c +0 -0
drivers/tty/tty_buffer.c renamed from drivers/char/tty_buffer.c +0 -0
drivers/tty/tty_io.c renamed from drivers/char/tty_io.c +0 -0
drivers/tty/tty_ioctl.c renamed from drivers/char/tty_ioctl.c +0 -0
drivers/tty/tty_ldisc.c renamed from drivers/char/tty_ldisc.c +0 -0
drivers/tty/tty_mutex.c renamed from drivers/char/tty_mutex.c +0 -0
drivers/tty/tty_port.c renamed from drivers/char/tty_port.c +0 -0
Signature · 1 line
1.7.3.1
PATCH 2/3 TTY: create drivers/tty/vt and move the vt code there
In reply to Greg KHThe vt and other related code is moved into the drivers/tty/vt directory.
---
drivers/char/Makefile | 33 -------------------------
drivers/tty/Makefile | 2 +
drivers/tty/vt/Makefile | 34 ++++++++++++++++++++++++++
drivers/{char => tty/vt}/consolemap.c | 0
drivers/{char => tty/vt}/cp437.uni | 0
drivers/{char => tty/vt}/defkeymap.c_shipped | 0
drivers/{char => tty/vt}/defkeymap.map | 0
drivers/{char => tty/vt}/keyboard.c | 0
drivers/{char => tty/vt}/selection.c | 0
drivers/{char => tty/vt}/vc_screen.c | 0
drivers/{char => tty/vt}/vt.c | 0
drivers/{char => tty/vt}/vt_ioctl.c | 0
12 files changed, 36 insertions(+), 33 deletions(-)
create mode 100644 drivers/tty/vt/Makefile
rename drivers/{char => tty/vt}/consolemap.c (100%)
rename drivers/{char => tty/vt}/cp437.uni (100%)
rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%)
rename drivers/{char => tty/vt}/defkeymap.map (100%)
rename drivers/{char => tty/vt}/keyboard.c (100%)
rename drivers/{char => tty/vt}/selection.c (100%)
rename drivers/{char => tty/vt}/vc_screen.c (100%)
rename drivers/{char => tty/vt}/vt.c (100%)
rename drivers/{char => tty/vt}/vt_ioctl.c (100%)drivers/char/Makefile +0 -33
@@ -2,18 +2,10 @@ # Makefile for the kernel character device drivers. # -# -# This file contains the font map for the default (hardware) font -# -FONTMAPFILE = cp437.uni - obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o -obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o -obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o -obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
@@ -106,28 +98,3 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o - -# Files generated that shall be removed upon make clean -clean-files := consolemap_deftbl.c defkeymap.c - -quiet_cmd_conmk = CONMK $@ - cmd_conmk = scripts/conmakehash $< > $@ - -$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) - $(call cmd,conmk) - -$(obj)/defkeymap.o: $(obj)/defkeymap.c - -# Uncomment if you're changing the keymap and have an appropriate -# loadkeys version for the map. By default, we'll use the shipped -# versions. -# GENERATE_KEYMAP := 1 - -ifdef GENERATE_KEYMAP - -$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map - loadkeys --mktable $< > [email protected] - sed -e 's/^static *//' [email protected] > $@ - rm [email protected] - -endif
drivers/tty/Makefile +2 -0
@@ -7,3 +7,5 @@ obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_N_HDLC) += n_hdlc.o obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_R3964) += n_r3964.o + +obj-y += vt/
drivers/tty/vt/Makefile new file +34 -0
@@ -0,0 +1,34 @@ +# +# This file contains the font map for the default (hardware) font +# +FONTMAPFILE = cp437.uni + +obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ + selection.o keyboard.o +obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o +obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o + +# Files generated that shall be removed upon make clean +clean-files := consolemap_deftbl.c defkeymap.c + +quiet_cmd_conmk = CONMK $@ + cmd_conmk = scripts/conmakehash $< > $@ + +$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) + $(call cmd,conmk) + +$(obj)/defkeymap.o: $(obj)/defkeymap.c + +# Uncomment if you're changing the keymap and have an appropriate +# loadkeys version for the map. By default, we'll use the shipped +# versions. +# GENERATE_KEYMAP := 1 + +ifdef GENERATE_KEYMAP + +$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map + loadkeys --mktable $< > [email protected] + sed -e 's/^static *//' [email protected] > $@ + rm [email protected] + +endif
drivers/tty/vt/consolemap.c renamed from drivers/char/consolemap.c +0 -0
drivers/tty/vt/cp437.uni renamed from drivers/char/cp437.uni +0 -0
drivers/tty/vt/defkeymap.c_shipped renamed from drivers/char/defkeymap.c_shipped +0 -0
drivers/tty/vt/defkeymap.map renamed from drivers/char/defkeymap.map +0 -0
drivers/tty/vt/keyboard.c renamed from drivers/char/keyboard.c +0 -0
drivers/tty/vt/selection.c renamed from drivers/char/selection.c +0 -0
drivers/tty/vt/vc_screen.c renamed from drivers/char/vc_screen.c +0 -0
drivers/tty/vt/vt.c renamed from drivers/char/vt.c +0 -0
drivers/tty/vt/vt_ioctl.c renamed from drivers/char/vt_ioctl.c +0 -0
Signature · 1 line
1.7.3.1
PATCH 3/3 TTY: move .gitignore from drivers/char/ to drivers/tty/vt/
In reply to Greg KHThe autogenerated files (consolemap_deftbl.c and defkeymap.c) need to be ignored by git, so move the .gitignore file that was doing it to the properly location now that the files have moved as well.
---
drivers/{char => tty/vt}/.gitignore | 0
1 files changed, 0 insertions(+), 0 deletions(-)
rename drivers/{char => tty/vt}/.gitignore (100%)drivers/tty/vt/.gitignore renamed from drivers/char/.gitignore +0 -0
Signature · 1 line
1.7.3.1