Robert P. J. Day
beb7dd86a1
Fix misspellings collected by members of KJ list.
...
Fix the misspellings of "propogate", "writting" and (oh, the shame
:-) "kenrel" in the source tree.
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com >
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2007-05-09 07:14:03 +02:00
David Sterba
3dde6ad8fc
Fix trivial typos in Kconfig* files
...
Fix several typos in help text in Kconfig* files.
Signed-off-by: David Sterba <dave@jikos.cz >
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2007-05-09 07:12:20 +02:00
vignesh babu
1cfb9c94b6
[IA64-SN2][KJ] mmtimer.c-kzalloc
...
Replacing kmalloc/memset combination with kzalloc.
Signed-off-by: vignesh babu <vignesh.babu@wipro.com >
Signed-off-by: Tony Luck <tony.luck@intel.com >
2007-05-08 11:53:27 -07:00
Linus Torvalds
5335a40be6
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
...
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
via: Make sure we flush write-combining using a follow-up read.
via: Try to improve command-buffer chaining.
drm: remove old taskqueue remnant
drm: rename badly named define and cleanup ioctl code spacing
radeon: Don't mess up page flipping when a file descriptor is closed.
drm/radeon: upgrade to 1.27 - make PCI GART more flexible
2007-05-08 11:52:35 -07:00
Linus Torvalds
df6d3916f3
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
...
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
[POWERPC] Abolish powerpc_flash_init()
[POWERPC] Early serial debug support for PPC44x
[POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
[POWERPC] Add device tree for Ebony
[POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
[POWERPC] MPIC U3/U4 MSI backend
[POWERPC] MPIC MSI allocator
[POWERPC] Enable MSI mappings for MPIC
[POWERPC] Tell Phyp we support MSI
[POWERPC] RTAS MSI implementation
[POWERPC] PowerPC MSI infrastructure
[POWERPC] Rip out the existing powerpc msi stubs
[POWERPC] Remove use of 4level-fixup.h for ppc32
[POWERPC] Add powerpc PCI-E reset API implementation
[POWERPC] Holly bootwrapper
[POWERPC] Holly DTS
[POWERPC] Holly defconfig
[POWERPC] Add support for 750CL Holly board
[POWERPC] Generalize tsi108 PCI setup
[POWERPC] Generalize tsi108 PHY types
...
Fixed conflict in include/asm-powerpc/kdebug.h manually
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:50:19 -07:00
Matthias Kaehlcke
c831c338f0
use mutex instead of semaphore in virtual console driver
...
The virtual console driver uses a semaphore as mutex. Use the mutex API
instead of the (binary) semaphore.
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com >
Cc: "Antonino A. Daplas" <adaplas@pol.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:33 -07:00
Antonino A. Daplas
042f10ec65
vt: expose system-wide UTF-8 default setting via sysfs
...
Create a variable, default_utf8, that defines the system-wide default UTF-8
setting. This variable can be altered via sysfs. If the variable is properly
set, this should mimimize breakage of UTF-8 encoded consoles when doing a
reset or echo -e '\033c' and of newly opened/allocated consoles.
This is based from patches by Jan Engelhardt and Paul LeoNerd Evans.
Signed-off-by: Antonino Daplas <adaplas@gmail.com >
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de >
Cc: Paul LeoNerd Evans <leonerd@leonerd.org.uk >
Cc: "H. Peter Anvin" <hpa@zytor.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:28 -07:00
Jan Engelhardt
fa6ce9ab5f
vt: add color support to the "underline" and "italic" attributes
...
Add color support to the "underline" and "italic" attributes as in
OpenBSD/NetBSD-style (vt220) and xterm.
Signed-off-by: Jan Engelhardt <jengelh@gmx.de >
Acked-by: "Antonino A. Daplas" <adaplas@pol.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:27 -07:00
Jan Engelhardt
1c2bbe6a11
vt: allow for the palette to be exposed and changed via sysfs
...
Allow for the palette to be exposed and changed via sysfs. A call to
/usr/bin/reset will slurp the new definitions in for the current console.
Already posted at http://lkml.org/lkml/2006/1/15/149
Signed-off-by: Jan Engelhardt <jengelh@gmx.de >
Cc: "Antonino A. Daplas" <adaplas@pol.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:27 -07:00
Jiri Slaby
c8e1693a4f
Char: cyclades, copyright and version changes
...
- add copyright
- move version one number upper and use MODULE_VERSION
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
3137553d3f
Char: cyclades, probe cleanup
...
- add fail paths
- merge 3 similar initializations into one (Z, Ze, Y)
[akpm@linux-foundation.org: build fix]
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:15:25 -07:00
Jiri Slaby
dd025c0c7a
Char: cyclades, dynamic ports
...
and save thus approx. 160k of .bss
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
f2462bfe55
Char: cyclades, fix tty device unregister
...
put_tty_driver after unregistering devices
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
f742903424
Char: cyclades, conditions cleanup
...
- 0 is not NULL
- use unlikely to hit the icache in isr more likely
- remove or comment empty if/else paths
[akpm@linux-foundation.org: build fix]
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:15:25 -07:00
Jiri Slaby
9fa1b3b185
Char: cyclades, remove locking macros
...
and use locally stored card structure if possible
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
6a0aa67b17
Char: cyclades, remove unused timestamps
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
3991428d9e
Char: cyclades, timers cleanup
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
ce71b0ffd0
Char: cyclades, fix blockmove
...
tty has no longer flip buffers accessible externally. Fix it by moving the
code to the tty_*flip* helpers.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
2c7fea9921
Char: cyclades, remove sleep_on
...
convert to wait_* and completion
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
875b206b5f
Char: cyclades, make info->card a pointer
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
6d8248e850
Char: cyclades, get rid of phys addresses
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
3046d50ea5
Char: cyclades, simplify variables initialization
...
- do not init static variables to 0
- simplify cy_init_card -- use memset(0) and do not zero each element
separately, also reorder init, so that same entries are inited at one
place
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:25 -07:00
Jiri Slaby
31b4f0a118
Char: cyclades, mark cyy_init_card as __devinit, not __init
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
217191910c
Char: cyclades, printk cleanups
...
- add printk KERN_ levels to each printk
- substitute printk with dev_* when device struct is available
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
80fada50ec
Char: cyclades, irq is int
...
don't fetch it to uchar
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
46039f8a64
Char: cyclades, remove useless fileds from cyclades_card
...
pde, ctl_phys and base_phys are useless -- they are never used.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
b81cc310f1
Char: cyclades, unexport struct cyclades_card
...
Do not export internal card data to userspace. cytune doesn't use this
anyway.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
cff9494fad
Char: cyclades, depends on PCI or ISA
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
6747cd93f3
Char: cyclades, switch to pci probing
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
c2ad4c7515
Char: cyclades, use IS_CYC_Z macro
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
73b52572ab
Char: isicom, use pr_debug
...
isicom, use pr_debug
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
f1e83c6c1e
Char: cyclades, allow DEBUG_SHIRQ
...
Test if base addr is non-null in ISR to prove the card has been correctly
initialized. This is needed for DEBUG_SHIRQ for example.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
85c93fa95b
Char: cyclades, clear interrupts before releasing
...
Without this patch, the driver sometimes causes "IRQXX: Nobody cares". Fix it
by turning off irqs when releasing.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
6ad1ccc196
Char: cyclades, tty_register_device separately for each device
...
Do not register all tty devices at the init time, delay it for the time until
some device is found.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:24 -07:00
Jiri Slaby
9dacf3b2f0
Char: cyclades, cy_init error handling
...
- do not panic if tty_register_driver fails
- handle fail paths properly
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
14a55a6789
Char: cyclades, remove some global vars
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
f3851e73ec
Char: cyclades, init card struct immediately
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
0809e2671d
Char: cyclades, move card entries init into function
...
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
58936d8d94
Char: cyclades, create cy_pci_probe
...
Move probing code to separate function for easy pci probing conversion.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
2b1da41fb3
Char: cyclades, init Ze immediately
...
There will be no other choice after introducing pci probing anyway.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
38d0909325
Char: cyclades, use pci_iomap/unmap
...
fork remove code for pci -- move it to separate, new, function and don't care
about pci in the former.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
d407c78188
Char: cyclades, create cy_init_Ze
...
Move Ze init code into new cy_init_Ze, because we will need it in another
place and it will make the code totally unreadable.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
cab9bdd14d
Char: cyclades, remove useless casts
...
cyclades, remove useless casts
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:23 -07:00
Jiri Slaby
ad39c30049
Char: cyclades, remove volatiles
...
cyclades, remove volatiles
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:22 -07:00
Jiri Slaby
b70509066c
Char: cyclades, timer cleanup
...
cyclades, timer cleanup
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:22 -07:00
Jiri Slaby
db05c3b1dd
Char: cyclades, cy_readX/writeX cleanup
...
cyclades, cy_readX/writeX cleanup
- cy_readX are placeholders for readX, remove it
- move cy_writeX macros into do {} while(0) to be safe
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:22 -07:00
Jiri Slaby
ffa68e79ff
Char: cyclades, remove PAUSE
...
cyclades, remove PAUSE
PAUSE expands to do {} while (0), it's useless.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:22 -07:00
Adrian Bunk
79df3c19aa
no longer #include <asm/kdebug.h>
...
Include the new linux/kdebug.h instead of asm/kdebug.h.
Simply remove the asm/kdebug.h include if both had been included.
Signed-off-by: Adrian Bunk <bunk@stusta.de >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:20 -07:00
Matthias Kaehlcke
0e82d5b618
use mutex instead of semaphore for misc char devices
...
The misc character device driver uses a semaphore as mutex. Use the mutex API
instead of the (binary) semaphore.
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:15 -07:00
Matthias Kaehlcke
d081d47044
use mutex instead of semaphore in TPM driver
...
The TPM driver uses two semaphores as mutexes. Use the mutex API instead of
the (binary) semaphores.
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com >
Cc: Kylene Hall <kjhall@us.ibm.com >
Cc: Marcel Selhorst <tpm@selhorst.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2007-05-08 11:15:15 -07:00