diff options
| author | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-15 20:36:15 +0000 |
|---|---|---|
| committer | Jon Smirl <jonsmirl@yahoo.com> | 2004-10-15 20:36:15 +0000 |
| commit | 91aa32742c49db0c553b5836afd28c8ea2436014 (patch) | |
| tree | c4031fe1630f01beca3a5e23b885290ae38f232b | |
| parent | fa50e2b5132b84353ae964a39c3b10ea270d15e8 (diff) | |
Move drm_cpu_valid out of drm_init. drm_init is empty now.
| -rw-r--r-- | linux-core/Makefile.kernel | 2 | ||||
| -rw-r--r-- | linux-core/drmP.h | 3 | ||||
| -rw-r--r-- | linux-core/drm_fops.c | 17 | ||||
| -rw-r--r-- | linux-core/drm_init.c | 16 |
4 files changed, 18 insertions, 20 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index e1d2c1c6..5a21a73f 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -8,7 +8,7 @@ # drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ - drm_drv.o drm_fops.o drm_init.o drm_ioctl.o drm_irq.o \ + drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \ drm_sysfs.o drm_memory_debug.o diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 49cd9049..e5ef3c15 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -725,9 +725,6 @@ static inline int drm_core_has_MTRR(struct drm_device *dev) /** \name Internal function definitions */ /*@{*/ - /* Misc. support (drm_init.h) */ -extern int drm_cpu_valid(void); - /* Driver support (drm_drv.h) */ extern int drm_fb_loaded; extern int __devinit drm_init(struct drm_driver *driver, diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index 54cebbcb..ca4f9c89 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -191,6 +191,23 @@ int drm_stub_open(struct inode *inode, struct file *filp) } /** + * Check whether DRI will run on this CPU. + * + * \return non-zero if the DRI will run on this CPU, or zero otherwise. + */ +static int drm_cpu_valid(void) +{ +#if defined(__i386__) + if (boot_cpu_data.x86 == 3) + return 0; /* No cmpxchg on a 386 */ +#endif +#if defined(__sparc__) && !defined(__sparc_v9__) + return 0; /* No cmpxchg before v9 sparc. */ +#endif + return 1; +} + +/** * Called whenever a process opens /dev/drm. * * \param inode device inode. diff --git a/linux-core/drm_init.c b/linux-core/drm_init.c index 0d3c1d88..2f04e264 100644 --- a/linux-core/drm_init.c +++ b/linux-core/drm_init.c @@ -35,19 +35,3 @@ #include "drmP.h" -/** - * Check whether DRI will run on this CPU. - * - * \return non-zero if the DRI will run on this CPU, or zero otherwise. - */ -int drm_cpu_valid(void) -{ -#if defined(__i386__) - if (boot_cpu_data.x86 == 3) - return 0; /* No cmpxchg on a 386 */ -#endif -#if defined(__sparc__) && !defined(__sparc_v9__) - return 0; /* No cmpxchg before v9 sparc. */ -#endif - return 1; -} |