summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hurd/hurd_types.defs25
-rw-r--r--libdiskfs/diskfs.h5
2 files changed, 8 insertions, 22 deletions
diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs
index 3a1d3c68..d37cd561 100644
--- a/hurd/hurd_types.defs
+++ b/hurd/hurd_types.defs
@@ -1,4 +1,4 @@
-/* MiG type declarations for Hurd interfaces
+/* MiG type declarations for Hurd interfaces -*- C -*-
Copyright (C) 1993, 1994 Free Software Foundation
This file is part of the GNU Hurd.
@@ -155,25 +155,10 @@ userprefix USERPREFIX;
serverprefix SERVERPREFIX;
#endif
-/* All RPCs which can be interrupted by `interrupt_operation'
- should be defined with this macro:
- INTR_ROUTINE (protocol_operation, (object: protocol_t; ...))
- */
-#define INTR_ROUTINE(name, args) \
- BEFORE_INTR_RPC \
- routine INTR_RPC_PREFIX##name##INTR_RPC_SUFFIX args; \
- AFTER_INTR_RPC
-#ifndef BEFORE_INTR_RPC
-#define BEFORE_INTR_RPC /* Usually empty. */
-#endif
-#ifndef AFTER_INTR_RPC
-#define AFTER_INTR_RPC /* Usually empty. */
-#endif
-#ifndef INTR_RPC_PREFIX
-#define INTR_RPC_PREFIX /* Usually empty. */
-#endif
-#ifndef INTR_RPC_SUFFIX
-#define INTR_RPC_SUFFIX /* Usually empty. */
+/* RPC interfaces which are interrupt compliant (see interrupt.defs)
+ should put ``INTR_INTERFACE'' at the beginning of their .defs file. */
+#ifndef INTR_INTERFACE
+#define INTR_INTERFACE /* Nothing special. */
#endif
type data_t = array[] of char;
diff --git a/libdiskfs/diskfs.h b/libdiskfs/diskfs.h
index 0c3d3143..17bf89dd 100644
--- a/libdiskfs/diskfs.h
+++ b/libdiskfs/diskfs.h
@@ -484,8 +484,9 @@ void diskfs_spawn_first_thread (void);
/* Once diskfs_root_node is set, call this if we are a bootstrap
filesystem. If you call this, then the library will call
- diskfs_init_completed once it has a valid proc and auth port.*/
-void diskfs_start_bootstrap (void);
+ diskfs_init_completed once it has a valid proc and auth port.
+ ARGV (the address) is supplied to the proc server. */
+void diskfs_start_bootstrap (char **argv);
/* Last step of init is to call this, which never returns. */
void diskfs_main_request_loop (void);