Skip to content

Commit 03b2e5c

Browse files
robnbehlendorf
authored andcommitted
libspl: move remaining ddi_* prototypes from zfs_context.h
Sponsored-by: https://despairlabs.com/sponsor/ Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <robn@despairlabs.com> Closes #17861
1 parent 559597b commit 03b2e5c

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

include/sys/zfs_context.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ extern "C" {
7777
#include <sys/zfs_context_os.h>
7878
#else /* _KERNEL || _STANDALONE */
7979

80-
#define _SYS_SUNDDI_H
81-
8280
#include <stdio.h>
8381
#include <stdlib.h>
8482
#include <stddef.h>
@@ -210,12 +208,6 @@ typedef off_t loff_t;
210208
extern int highbit64(uint64_t i);
211209
extern int lowbit64(uint64_t i);
212210

213-
/*
214-
* Hostname information
215-
*/
216-
extern int ddi_strtoull(const char *str, char **nptr, int base,
217-
u_longlong_t *result);
218-
219211
/*
220212
* Kernel modules
221213
*/

lib/libspl/include/sys/sunddi.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,16 @@
2121
* CDDL HEADER END
2222
*/
2323
/*
24-
* Copyright (c) 2008 by Sun Microsystems, Inc.
24+
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
25+
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
26+
* Copyright (c) 2012, 2018 by Delphix. All rights reserved.
27+
* Copyright (c) 2012, Joyent, Inc. All rights reserved.
2528
*/
2629

2730
#ifndef _SYS_SUNDDI_H
2831
#define _SYS_SUNDDI_H
2932

33+
extern int ddi_strtoull(const char *str, char **nptr, int base,
34+
u_longlong_t *result);
35+
3036
#endif /* _SYS_SUNDDI_H */

0 commit comments

Comments
 (0)