Commit a653cc56 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Mackerras

[PATCH] make vt_ioctl ix86isms explicit

sys_ioperm is only implemented on x86 (i386/x86_64).  Make the
ifdefs in vt_ioctl.c more explicit so the other architectures can
get rid of their stubs in favour of just using sys_ni_syscall in
the syscall table.

Maybe we should remove it altogether, it looks like remnants from
some very early X386 times (ie the Thomas Roell timeframe).
parent 336a1f77
...@@ -59,7 +59,7 @@ struct vt_struct *vt_cons[MAX_NR_CONSOLES]; ...@@ -59,7 +59,7 @@ struct vt_struct *vt_cons[MAX_NR_CONSOLES];
*/ */
unsigned char keyboard_type = KB_101; unsigned char keyboard_type = KB_101;
#if !defined(__alpha__) && !defined(__ia64__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__) #ifdef CONFIG_X86
asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on); asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
#endif #endif
...@@ -424,11 +424,13 @@ int vt_ioctl(struct tty_struct *tty, struct file * file, ...@@ -424,11 +424,13 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
ucval = keyboard_type; ucval = keyboard_type;
goto setchar; goto setchar;
#if !defined(__alpha__) && !defined(__ia64__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__)
/* /*
* These cannot be implemented on any machine that implements * These cannot be implemented on any machine that implements
* ioperm() in user level (such as Alpha PCs). * ioperm() in user level (such as Alpha PCs) or not at all.
*
* XXX: you should never use these, just call ioperm directly..
*/ */
#ifdef CONFIG_X86
case KDADDIO: case KDADDIO:
case KDDELIO: case KDDELIO:
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment