Changeset b79d450 in mainline for kernel/arch/amd64/include/interrupt.h

Timestamp:

2010-01-27T20:35:49Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fb6f1a5

Parents:

fccc236 (diff), 95e6c4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/amd64/include/interrupt.h (modified) (3 diffs)

kernel/arch/amd64/include/interrupt.h

@@ -70 +70 @@
 
 /** This is passed to interrupt handlers */
-typedef struct {
+typedef struct istate {
         uint64_t rax;
         uint64_t rcx;
@@ -80 +80 @@
         uint64_t r10;
         uint64_t r11;
+        uint64_t rbp;
         uint64_t error_word;
         uint64_t rip;
@@ -101 +102 @@
         return istate->rip;
 }
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return istate->rbp;
+}
 
 extern void (* disable_irqs_function)(uint16_t irqmask);