Wed Jul 24 03:11:06 2013 UTC ()
drm_bufs.c doesn't need <asm/mtrr.h> after all (drmP.h gets it).


(riastradh)
diff -r1.1.1.1.2.11 -r1.1.1.1.2.12 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
cvs diff -r1.1.1.1.2.11 -r1.1.1.1.2.12 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c 2013/07/24 02:48:06 1.1.1.1.2.11
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c 2013/07/24 03:11:06 1.1.1.1.2.12
@@ -29,27 +29,26 @@ @@ -29,27 +29,26 @@
29 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 29 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
30 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 30 * VA LINUX SYSTEMS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
31 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 31 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
32 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 32 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
33 * OTHER DEALINGS IN THE SOFTWARE. 33 * OTHER DEALINGS IN THE SOFTWARE.
34 */ 34 */
35 35
36#include <linux/vmalloc.h> 36#include <linux/vmalloc.h>
37#include <linux/slab.h> 37#include <linux/slab.h>
38#include <linux/sched.h> 38#include <linux/sched.h>
39#include <linux/log2.h> 39#include <linux/log2.h>
40#include <linux/export.h> 40#include <linux/export.h>
41#include <linux/mm.h> 41#include <linux/mm.h>
42#include <asm/mtrr.h> 
43#include <asm/shmparam.h> 42#include <asm/shmparam.h>
44#include <drm/drmP.h> 43#include <drm/drmP.h>
45 44
46static struct drm_map_list *drm_find_matching_map(struct drm_device *dev, 45static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
47 struct drm_local_map *map) 46 struct drm_local_map *map)
48{ 47{
49 struct drm_map_list *entry; 48 struct drm_map_list *entry;
50 list_for_each_entry(entry, &dev->maplist, head) { 49 list_for_each_entry(entry, &dev->maplist, head) {
51 /* 50 /*
52 * Because the kernel-userspace ABI is fixed at a 32-bit offset 51 * Because the kernel-userspace ABI is fixed at a 32-bit offset
53 * while PCI resources may live above that, we only compare the 52 * while PCI resources may live above that, we only compare the
54 * lower 32 bits of the map offset for maps of type 53 * lower 32 bits of the map offset for maps of type
55 * _DRM_FRAMEBUFFER or _DRM_REGISTERS. 54 * _DRM_FRAMEBUFFER or _DRM_REGISTERS.