Wed Jul 24 03:30:02 2013 UTC ()
Fill struct shrink_control with nr_to_scan in <linux/shrinker.h>.

i915_gem wants to use it.


(riastradh)
diff -r1.1.2.1 -r1.1.2.2 src/sys/external/bsd/drm2/include/linux/shrinker.h
cvs diff -r1.1.2.1 -r1.1.2.2 src/sys/external/bsd/drm2/include/linux/shrinker.h (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/include/linux/shrinker.h 2013/07/24 03:07:48 1.1.2.1
+++ src/sys/external/bsd/drm2/include/linux/shrinker.h 2013/07/24 03:30:02 1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: shrinker.h,v 1.1.2.1 2013/07/24 03:07:48 riastradh Exp $ */ 1/* $NetBSD: shrinker.h,v 1.1.2.2 2013/07/24 03:30:02 riastradh Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2013 The NetBSD Foundation, Inc. 4 * Copyright (c) 2013 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Taylor R. Campbell. 8 * by Taylor R. Campbell.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -22,27 +22,29 @@ @@ -22,27 +22,29 @@
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#ifndef _LINUX_SHRINKER_H_ 32#ifndef _LINUX_SHRINKER_H_
33#define _LINUX_SHRINKER_H_ 33#define _LINUX_SHRINKER_H_
34 34
35struct shrink_control; 35struct shrink_control {
 36 unsigned long nr_to_scan;
 37};
36 38
37struct shrinker { 39struct shrinker {
38 int (*shrink)(struct shrinker *, struct shrink_control *); 40 int (*shrink)(struct shrinker *, struct shrink_control *);
39 int seeks; 41 int seeks;
40}; 42};
41 43
42#define DEFAULT_SEEKS 2 /* XXX cargo-culted from Linux */ 44#define DEFAULT_SEEKS 2 /* XXX cargo-culted from Linux */
43 45
44static inline void 46static inline void
45register_shrinker(struct shrinker *shrinker __unused) 47register_shrinker(struct shrinker *shrinker __unused)
46{ 48{
47} 49}
48 50