diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/uts/common/sys/hotplug/hpcsvc.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/uts/common/sys/hotplug/hpcsvc.h')
| -rw-r--r-- | usr/src/uts/common/sys/hotplug/hpcsvc.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/usr/src/uts/common/sys/hotplug/hpcsvc.h b/usr/src/uts/common/sys/hotplug/hpcsvc.h index 9975731c64..7ef8935cef 100644 --- a/usr/src/uts/common/sys/hotplug/hpcsvc.h +++ b/usr/src/uts/common/sys/hotplug/hpcsvc.h @@ -21,6 +21,8 @@ */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + * * Copyright (c) 1999-2000 by Sun Microsystems, Inc. * All rights reserved. */ @@ -28,8 +30,6 @@ #ifndef _SYS_HOTPLUG_HPCSVC_H #define _SYS_HOTPLUG_HPCSVC_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/hotplug/hpctrl.h> #ifdef __cplusplus @@ -40,7 +40,6 @@ extern "C" { #define HPC_EVENT_NORMAL 0 /* normal, queued event handling */ #define HPC_EVENT_SYNCHRONOUS 1 /* unqueued sync. event handling */ -#ifdef __STDC__ extern int hpc_nexus_register_bus(dev_info_t *dip, int (* callback)(dev_info_t *dip, hpc_slot_t handle, hpc_slot_info_t *slot_info, int slot_state), @@ -54,16 +53,6 @@ extern int hpc_nexus_control(hpc_slot_t handle, int request, caddr_t arg); extern int hpc_install_event_handler(hpc_slot_t handle, uint_t event_mask, int (*event_handler)(caddr_t, uint_t), caddr_t arg); extern int hpc_remove_event_handler(hpc_slot_t handle); -#else -extern int hpc_nexus_register_bus(); -extern int hpc_nexus_unregister_bus(); -extern int hpc_nexus_connect(); -extern int hpc_nexus_disconnect(); -extern int hpc_nexus_insert(); -extern int hpc_nexus_remove(); -extern int hpc_nexus_control(); -extern int hpc_install_event_handler(); -#endif #ifdef __cplusplus } |