diff options
Diffstat (limited to 'drivers/char/drm/drm_os_linux.h')
-rw-r--r-- | drivers/char/drm/drm_os_linux.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h index b14cd370dea5..d51aeb4966f4 100644 --- a/drivers/char/drm/drm_os_linux.h +++ b/drivers/char/drm/drm_os_linux.h | |||
@@ -3,7 +3,6 @@ | |||
3 | * OS abstraction macros. | 3 | * OS abstraction macros. |
4 | */ | 4 | */ |
5 | 5 | ||
6 | |||
7 | #include <linux/interrupt.h> /* For task queue support */ | 6 | #include <linux/interrupt.h> /* For task queue support */ |
8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
9 | 8 | ||
@@ -47,25 +46,25 @@ | |||
47 | #else | 46 | #else |
48 | /* define some dummy types for non AGP supporting kernels */ | 47 | /* define some dummy types for non AGP supporting kernels */ |
49 | struct no_agp_kern { | 48 | struct no_agp_kern { |
50 | unsigned long aper_base; | 49 | unsigned long aper_base; |
51 | unsigned long aper_size; | 50 | unsigned long aper_size; |
52 | }; | 51 | }; |
53 | #define DRM_AGP_MEM int | 52 | #define DRM_AGP_MEM int |
54 | #define DRM_AGP_KERN struct no_agp_kern | 53 | #define DRM_AGP_KERN struct no_agp_kern |
55 | #endif | 54 | #endif |
56 | 55 | ||
57 | #if !(__OS_HAS_MTRR) | 56 | #if !(__OS_HAS_MTRR) |
58 | static __inline__ int mtrr_add (unsigned long base, unsigned long size, | 57 | static __inline__ int mtrr_add(unsigned long base, unsigned long size, |
59 | unsigned int type, char increment) | 58 | unsigned int type, char increment) |
60 | { | 59 | { |
61 | return -ENODEV; | 60 | return -ENODEV; |
62 | } | 61 | } |
63 | 62 | ||
64 | static __inline__ int mtrr_del (int reg, unsigned long base, | 63 | static __inline__ int mtrr_del(int reg, unsigned long base, unsigned long size) |
65 | unsigned long size) | ||
66 | { | 64 | { |
67 | return -ENODEV; | 65 | return -ENODEV; |
68 | } | 66 | } |
67 | |||
69 | #define MTRR_TYPE_WRCOMB 1 | 68 | #define MTRR_TYPE_WRCOMB 1 |
70 | 69 | ||
71 | #endif | 70 | #endif |
@@ -99,7 +98,7 @@ static __inline__ int mtrr_del (int reg, unsigned long base, | |||
99 | 98 | ||
100 | #define DRM_GET_PRIV_WITH_RETURN(_priv, _filp) _priv = _filp->private_data | 99 | #define DRM_GET_PRIV_WITH_RETURN(_priv, _filp) _priv = _filp->private_data |
101 | 100 | ||
102 | /** | 101 | /** |
103 | * Get the pointer to the SAREA. | 102 | * Get the pointer to the SAREA. |
104 | * | 103 | * |
105 | * Searches the SAREA on the mapping lists and points drm_device::sarea to it. | 104 | * Searches the SAREA on the mapping lists and points drm_device::sarea to it. |
@@ -143,7 +142,5 @@ do { \ | |||
143 | remove_wait_queue(&(queue), &entry); \ | 142 | remove_wait_queue(&(queue), &entry); \ |
144 | } while (0) | 143 | } while (0) |
145 | 144 | ||
146 | |||
147 | #define DRM_WAKEUP( queue ) wake_up_interruptible( queue ) | 145 | #define DRM_WAKEUP( queue ) wake_up_interruptible( queue ) |
148 | #define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue ) | 146 | #define DRM_INIT_WAITQUEUE( queue ) init_waitqueue_head( queue ) |
149 | |||