Wed Jul 24 02:44:48 2013 UTC ()

Ctassert that AGP_PAGE_SIZE == PAGE_SIZE in drm_agp_netbsd.h.

Linux assumes this.


(riastradh)

diff -r1.1.2.2 -r1.1.2.3 src/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h

--- src/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h 2013/07/24 01:59:52	1.1.2.2
+++ src/sys/external/bsd/drm2/include/drm/drm_agp_netbsd.h 2013/07/24 02:44:48	1.1.2.3

 @@ -1,14 +1,14 @@
-/*	$NetBSD: drm_agp_netbsd.h,v 1.1.2.2 2013/07/24 01:59:52 riastradh Exp $	*/
+/*	$NetBSD: drm_agp_netbsd.h,v 1.1.2.3 2013/07/24 02:44:48 riastradh Exp $	*/
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -38,26 +38,29 @@
  * You have been warned!
  */
 #include <sys/agpio.h>
 #include <dev/pci/pcivar.h>	/* XXX include order botch */
 #include <dev/pci/agpvar.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #define	__OS_HAS_AGP	1
 __CTASSERT(PAGE_SIZE == AGP_PAGE_SIZE);
 __CTASSERT(PAGE_SHIFT == AGP_PAGE_SHIFT);
 typedef struct agp_memory DRM_AGP_MEM;
 typedef struct agp_info DRM_AGP_KERN;
 struct agp_bridge_data {
 	struct agp_softc abd_sc; /* XXX Abstraction violation! */
 };
 /*
  * We already have a struct agp_memory, but fortunately it looks like
  * it may accidentally work out.
  */
 #if 0