Changeset 11629 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 25, 2008 4:07:24 PM (16 years ago)

Author:

vboxsync

Message:

Linux additions: 64-bit fixes

Location:

trunk/src/VBox/Additions/linux

Files:

• module/Makefile.module (modified) (1 diff)
• module/hgcmcall.c (modified) (1 diff)
• sharedfolders/Makefile.module (modified) (1 diff)

trunk/src/VBox/Additions/linux/module/Makefile.module

@@ -182 +182 @@
  export INCL
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ \
+KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 \
             -DIN_RT_R0 -DIN_SUP_R0 -DVBOX -DVBGL_VBOXGUEST -DVBOX_HGCM \
             -DLOG_TO_BACKDOOR -DRT_WITH_VBOX -DIN_MODULE -DIN_GUEST_R0
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+ KFLAGS  += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+else
+ KFLAGS  += -DRT_ARCH_X86
+endif
 ifeq ($(BUILD_TYPE),debug)
 KFLAGS   += -DDEBUG

trunk/src/VBox/Additions/linux/module/hgcmcall.c

@@ -108 +108 @@
             break;
         default:
-            LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: unsupported or unknown parameter type\n"));
+            LogRel(("VBOXGUEST_IOCTL_HGCM_CALL: unsupported or unknown parameter type (index=%d, type=%d)\n",
+                     i, VBOXGUEST_HGCM_CALL_PARMS(hgcmR3)[i].type));
             kfree(hgcmR0);
             return -EINVAL;

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -174 +174 @@
  export INCL
 endif
-KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -D_X86_ -DIN_RT_R0 \
+KFLAGS   := -D__KERNEL__ -DMODULE -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 \
             -DIN_SUP_R0 -DVBOX -DVBOX_HGCM -DLOG_TO_BACKDOOR -DIN_MODULE \
             -DIN_GUEST_R0
+ifeq ($(BUILD_TARGET_ARCH),amd64)
+ KFLAGS  += -DRT_ARCH_AMD64 -DVBOX_WITH_64_BITS_GUESTS
+else
+ KFLAGS  += -DRT_ARCH_X86
+endif
 ifeq ($(BUILD_TYPE),debug)
 KFLAGS   += -DDEBUG