Wed Jul 24 03:36:48 2013 UTC ()
Add EREMOTEIO as an alias for EIO to <linux/err.h>.


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

--- src/sys/external/bsd/drm2/include/linux/Attic/err.h 2013/07/24 02:23:48 1.1.2.2
+++ src/sys/external/bsd/drm2/include/linux/Attic/err.h 2013/07/24 03:36:48 1.1.2.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: err.h,v 1.1.2.2 2013/07/24 02:23:48 riastradh Exp $ */ 1/* $NetBSD: err.h,v 1.1.2.3 2013/07/24 03:36:48 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.
@@ -28,26 +28,28 @@ @@ -28,26 +28,28 @@
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_ERR_H_ 32#ifndef _LINUX_ERR_H_
33#define _LINUX_ERR_H_ 33#define _LINUX_ERR_H_
34 34
35/* XXX Linux uses long and int inconsistently here. Hope this works out. */ 35/* XXX Linux uses long and int inconsistently here. Hope this works out. */
36 36
37#include <sys/types.h> 37#include <sys/types.h>
38#include <sys/errno.h> 38#include <sys/errno.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40 40
 41#define EREMOTEIO EIO /* XXX Urk... */
 42
41#define MAX_ERRNO ELAST 43#define MAX_ERRNO ELAST
42 44
43static inline bool 45static inline bool
44IS_ERR_VALUE(uintptr_t n) 46IS_ERR_VALUE(uintptr_t n)
45{ 47{
46 return (n >= (uintptr_t)-MAX_ERRNO); 48 return (n >= (uintptr_t)-MAX_ERRNO);
47} 49}
48 50
49static inline void * 51static inline void *
50ERR_PTR(int error) 52ERR_PTR(int error)
51{ 53{
52 KASSERT(error < 0); 54 KASSERT(error < 0);
53 return (void *)(intptr_t)error; 55 return (void *)(intptr_t)error;