[haiku-commits] haiku: hrev46718 - headers/private/kernel/arch/x86 src/add-ons/kernel/file_systems headers/private/kernel/arch src/add-ons/kernel/drivers src/system/kernel/scheduler
- From: pdziepak@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 20 Jan 2014 04:22:22 +0100 (CET)
hrev46718 adds 4 changesets to branch 'master'
old head: 88c54b548550f298727c450f2330cdfd59533ad9
new head: e1720098c681dcf5205732af1737e9a46b2eac11
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e172009+%5E88c54b5
----------------------------------------------------------------------------
73db12a: kernel: Align user_thread objects to CACHE_LINE_SIZE
59b9b52: scheduler: system_time() may be unreliable
On multisocket systems as well as under virtual machines logical CPUs
may use separate TSC. We could attempt to synchronize them what probably
would solve problems on multisocket systems. Unfortunately, when running
under hypervisor there is still a chance that TSC will get out of sync
again (e.g. cpufreq enabled on host when there is no invariant TSC). As
long as we use RDTSC as our main time source the scheduler must accept the
fact that time may go backwards (what isn't really a serious problem).
1a5afe0: add-ons/kernel: Use UsePrivateKernelHeaders where appropriate
e172009: kernel: No need for arch specific ifdefs in arch/atomic.h
[ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
30 files changed, 61 insertions(+), 38 deletions(-)
headers/private/kernel/arch/atomic.h | 9 +--------
headers/private/kernel/arch/x86/arch_atomic.h | 17 +++++++++++++++++
src/add-ons/kernel/bus_managers/firewire/Jamfile | 3 ++-
.../kernel/drivers/audio/ac97/sis7018/Jamfile | 3 ++-
src/add-ons/kernel/drivers/bus/firewire/Jamfile | 3 ++-
src/add-ons/kernel/drivers/bus/usb/Jamfile | 2 +-
src/add-ons/kernel/drivers/common/Jamfile | 2 +-
.../kernel/drivers/disk/floppy/pc_floppy/Jamfile | 3 ++-
.../kernel/drivers/disk/usb/usb_disk/Jamfile | 3 ++-
.../kernel/drivers/disk/usb/usb_floppy/Jamfile | 2 +-
src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile | 2 +-
.../kernel/drivers/graphics/intel_extreme/Jamfile | 4 ++--
src/add-ons/kernel/drivers/network/sis19x/Jamfile | 3 ++-
src/add-ons/kernel/drivers/network/usb_ecm/Jamfile | 3 ++-
src/add-ons/kernel/drivers/printer/usb/Jamfile | 2 +-
src/add-ons/kernel/file_systems/fat/Jamfile | 2 +-
src/add-ons/kernel/file_systems/googlefs/Jamfile | 2 +-
src/add-ons/kernel/file_systems/iso9660/Jamfile | 2 +-
src/add-ons/kernel/file_systems/ntfs/Jamfile | 2 +-
src/add-ons/kernel/file_systems/reiserfs/Jamfile | 2 +-
src/add-ons/kernel/generic/ata_adapter/Jamfile | 3 ++-
src/add-ons/kernel/generic/locked_pool/Jamfile | 2 +-
src/add-ons/kernel/generic/scsi_periph/Jamfile | 3 ++-
.../datalink_protocols/ethernet_frame/Jamfile | 3 ++-
.../datalink_protocols/loopback_frame/Jamfile | 3 ++-
src/add-ons/kernel/network/devices/loopback/Jamfile | 3 ++-
src/add-ons/kernel/network/protocols/icmp/Jamfile | 3 ++-
src/add-ons/kernel/network/protocols/icmp6/Jamfile | 3 ++-
src/system/kernel/scheduler/scheduler_thread.h | 3 +--
src/system/kernel/team.cpp | 2 +-
############################################################################
Commit: 73db12ab31449c0589284bccabc39dfa8d218309
URL: http://cgit.haiku-os.org/haiku/commit/?id=73db12a
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Sun Jan 19 18:27:48 2014 UTC
kernel: Align user_thread objects to CACHE_LINE_SIZE
----------------------------------------------------------------------------
diff --git a/src/system/kernel/team.cpp b/src/system/kernel/team.cpp
index dfa50c7..b715635 100644
--- a/src/system/kernel/team.cpp
+++ b/src/system/kernel/team.cpp
@@ -3458,7 +3458,7 @@ team_allocate_user_thread(Team* team)
while (true) {
// enough space left?
- size_t needed = ROUNDUP(sizeof(user_thread), 128);
+ size_t needed = ROUNDUP(sizeof(user_thread), CACHE_LINE_SIZE);
if (team->user_data_size - team->used_user_data < needed) {
// try to resize the area
if (resize_area(team->user_data_area,
############################################################################
Commit: 59b9b52aafcba9847df3791c525fac03c3caec3e
URL: http://cgit.haiku-os.org/haiku/commit/?id=59b9b52
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Mon Jan 20 02:14:56 2014 UTC
scheduler: system_time() may be unreliable
On multisocket systems as well as under virtual machines logical CPUs
may use separate TSC. We could attempt to synchronize them what probably
would solve problems on multisocket systems. Unfortunately, when running
under hypervisor there is still a chance that TSC will get out of sync
again (e.g. cpufreq enabled on host when there is no invariant TSC). As
long as we use RDTSC as our main time source the scheduler must accept the
fact that time may go backwards (what isn't really a serious problem).
----------------------------------------------------------------------------
diff --git a/src/system/kernel/scheduler/scheduler_thread.h
b/src/system/kernel/scheduler/scheduler_thread.h
index b5fa05c..200266c 100644
--- a/src/system/kernel/scheduler/scheduler_thread.h
+++ b/src/system/kernel/scheduler/scheduler_thread.h
@@ -394,8 +394,7 @@ ThreadData::Enqueue()
SCHEDULER_ENTER_FUNCTION();
if (!fReady) {
- ASSERT(system_time() - fWentSleep >= 0);
- if (gTrackCoreLoad) {
+ if (gTrackCoreLoad && system_time() - fWentSleep > 0) {
fMeasureAvailableTime += system_time() - fWentSleep;
fCore->UpdateLoad(fNeededLoad);
############################################################################
Commit: 1a5afe0404684d5fa09b620c18438eadcb963f4e
URL: http://cgit.haiku-os.org/haiku/commit/?id=1a5afe0
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Mon Jan 20 03:00:11 2014 UTC
add-ons/kernel: Use UsePrivateKernelHeaders where appropriate
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/bus_managers/firewire/Jamfile
b/src/add-ons/kernel/bus_managers/firewire/Jamfile
index a5f6b5d..e33b186 100644
--- a/src/add-ons/kernel/bus_managers/firewire/Jamfile
+++ b/src/add-ons/kernel/bus_managers/firewire/Jamfile
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel bus_managers firewire ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
-UsePrivateHeaders firewire kernel ;
+UsePrivateHeaders firewire ;
+UsePrivateKernelHeaders ;
DEFINES += _KERNEL=1 ;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
index 07ec240..b3bf580 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/sis7018/Jamfile
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 sis7018 ;
-UsePrivateHeaders kernel media ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders media ;
UsePrivateHeaders [ FDirName kernel util ] ;
diff --git a/src/add-ons/kernel/drivers/bus/firewire/Jamfile
b/src/add-ons/kernel/drivers/bus/firewire/Jamfile
index 67fa24e..f9ed678 100644
--- a/src/add-ons/kernel/drivers/bus/firewire/Jamfile
+++ b/src/add-ons/kernel/drivers/bus/firewire/Jamfile
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers bus firewire ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
-UsePrivateHeaders firewire kernel ;
+UsePrivateHeaders firewire ;
+UsePrivateKernelHeaders ;
SubDirCcFlags [ FDefines _KERNEL=1 ] ;
diff --git a/src/add-ons/kernel/drivers/bus/usb/Jamfile
b/src/add-ons/kernel/drivers/bus/usb/Jamfile
index dc57e66..be0d719 100644
--- a/src/add-ons/kernel/drivers/bus/usb/Jamfile
+++ b/src/add-ons/kernel/drivers/bus/usb/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers bus usb ;
SetSubDirSupportedPlatformsBeOSCompatible ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
if $(TARGET_PLATFORM) != haiku {
UsePublicHeaders [ FDirName drivers ] ;
}
diff --git a/src/add-ons/kernel/drivers/common/Jamfile
b/src/add-ons/kernel/drivers/common/Jamfile
index 711ec09..c1618a9 100644
--- a/src/add-ons/kernel/drivers/common/Jamfile
+++ b/src/add-ons/kernel/drivers/common/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel drivers common ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
KernelAddon dprintf :
dprintf.cpp
diff --git a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
index a83bd9d..80741fe 100644
--- a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk floppy
pc_floppy ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders drivers kernel ;
+UsePrivateHeaders drivers ;
+UsePrivateKernelHeaders ;
KernelAddon pc_floppy :
floppy.c
diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile
b/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile
index 995055a..b66cede 100644
--- a/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/usb/usb_disk/Jamfile
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_disk ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
-UsePrivateHeaders drivers kernel ;
+UsePrivateHeaders drivers ;
+UsePrivateKernelHeaders ;
KernelAddon usb_disk :
usb_disk.cpp
diff --git a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile
b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile
index 323b908..6a6fb51 100644
--- a/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/usb/usb_floppy/Jamfile
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers disk usb usb_floppy ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
KernelAddon usb_floppy :
usb_disk.cpp
diff --git a/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile
b/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile
index d8dc15c..91303a4 100644
--- a/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/virtual/nbd/Jamfile
@@ -9,7 +9,7 @@ if $(TARGET_PLATFORM) = haiku {
# lock.h wants debug.h and others.
#UsePrivateHeaders kernel ;
#UsePublicHeaders kernel ;
- UsePrivateHeaders [ FDirName kernel ] ;
+ UsePrivateKernelHeaders ;
}
KernelAddon nbd :
diff --git a/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile
b/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile
index 8ac97c6..33e0b0f 100644
--- a/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile
+++ b/src/add-ons/kernel/drivers/graphics/intel_extreme/Jamfile
@@ -4,8 +4,8 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders [ FDirName graphics intel_extreme ] ;
UsePrivateHeaders [ FDirName graphics common ] ;
-UsePrivateHeaders graphics kernel ;
-UsePrivateHeaders shared ;
+UsePrivateHeaders graphics ;
+UsePrivateKernelHeaders ;
KernelAddon intel_extreme :
bios.cpp
diff --git a/src/add-ons/kernel/drivers/network/sis19x/Jamfile
b/src/add-ons/kernel/drivers/network/sis19x/Jamfile
index 4f58405..26ca3a5 100644
--- a/src/add-ons/kernel/drivers/network/sis19x/Jamfile
+++ b/src/add-ons/kernel/drivers/network/sis19x/Jamfile
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network sis19x ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
UsePrivateHeaders [ FDirName kernel util ] ;
diff --git a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile
b/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile
index a23d220..1917819 100644
--- a/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile
+++ b/src/add-ons/kernel/drivers/network/usb_ecm/Jamfile
@@ -2,7 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers network usb_ecm ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
KernelAddon usb_ecm :
Driver.cpp
diff --git a/src/add-ons/kernel/drivers/printer/usb/Jamfile
b/src/add-ons/kernel/drivers/printer/usb/Jamfile
index 25713c0..3e5c238 100644
--- a/src/add-ons/kernel/drivers/printer/usb/Jamfile
+++ b/src/add-ons/kernel/drivers/printer/usb/Jamfile
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel drivers printer usb ;
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
KernelAddon usb_printer :
usb_printer.cpp
diff --git a/src/add-ons/kernel/file_systems/fat/Jamfile
b/src/add-ons/kernel/file_systems/fat/Jamfile
index 4ac052b..4b2cb09 100644
--- a/src/add-ons/kernel/file_systems/fat/Jamfile
+++ b/src/add-ons/kernel/file_systems/fat/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel file_systems fat ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
SubDirCcFlags -DTRACK_FILENAME ;
diff --git a/src/add-ons/kernel/file_systems/googlefs/Jamfile
b/src/add-ons/kernel/file_systems/googlefs/Jamfile
index 074252a..486613e 100644
--- a/src/add-ons/kernel/file_systems/googlefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/googlefs/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel file_systems googlefs ;
SetSubDirSupportedPlatformsBeOSCompatible ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
#SubDirCcFlags -DTRACK_FILENAME ;
#SubDirCcFlags -DDEBUG_GOOGLEFS=1 ;
diff --git a/src/add-ons/kernel/file_systems/iso9660/Jamfile
b/src/add-ons/kernel/file_systems/iso9660/Jamfile
index 98e7658..b3453c8 100644
--- a/src/add-ons/kernel/file_systems/iso9660/Jamfile
+++ b/src/add-ons/kernel/file_systems/iso9660/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel file_systems iso9660 ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
# set some additional defines
SubDirC++Flags -fno-rtti ;
diff --git a/src/add-ons/kernel/file_systems/ntfs/Jamfile
b/src/add-ons/kernel/file_systems/ntfs/Jamfile
index d16ff75..cc8febd 100644
--- a/src/add-ons/kernel/file_systems/ntfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/ntfs/Jamfile
@@ -6,7 +6,7 @@ SubDirHdrs [ FDirName $(SUBDIR) utils ] ;
SubDirCcFlags -DHAVE_CONFIG_H=1 ;
SubDirC++Flags -DHAVE_CONFIG_H=1 ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) utils ] ;
diff --git a/src/add-ons/kernel/file_systems/reiserfs/Jamfile
b/src/add-ons/kernel/file_systems/reiserfs/Jamfile
index 67b1552..90bb57e 100644
--- a/src/add-ons/kernel/file_systems/reiserfs/Jamfile
+++ b/src/add-ons/kernel/file_systems/reiserfs/Jamfile
@@ -4,7 +4,7 @@ local userlandFSTop = [ FDirName $(HAIKU_TOP) src add-ons
kernel file_systems
userlandfs ] ;
local userlandFSIncludes = [ PrivateHeaders userlandfs ] ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
SubDirHdrs [ FDirName $(userlandFSIncludes) shared ] ;
SEARCH_SOURCE += [ FDirName $(userlandFSTop) shared ] ;
diff --git a/src/add-ons/kernel/generic/ata_adapter/Jamfile
b/src/add-ons/kernel/generic/ata_adapter/Jamfile
index 7f846d7..aa2e79d 100644
--- a/src/add-ons/kernel/generic/ata_adapter/Jamfile
+++ b/src/add-ons/kernel/generic/ata_adapter/Jamfile
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel generic ata_adapter ;
-UsePrivateHeaders drivers kernel ;
+UsePrivateHeaders drivers ;
+UsePrivateKernelHeaders ;
KernelAddon ata_adapter :
ata_adapter.cpp
diff --git a/src/add-ons/kernel/generic/locked_pool/Jamfile
b/src/add-ons/kernel/generic/locked_pool/Jamfile
index 8bb4a5e..9bcabd0 100644
--- a/src/add-ons/kernel/generic/locked_pool/Jamfile
+++ b/src/add-ons/kernel/generic/locked_pool/Jamfile
@@ -1,6 +1,6 @@
SubDir HAIKU_TOP src add-ons kernel generic locked_pool ;
-UsePrivateHeaders kernel ;
+UsePrivateKernelHeaders ;
# enable debug output, if debugging is enabled
if $(DEBUG) != 0 {
diff --git a/src/add-ons/kernel/generic/scsi_periph/Jamfile
b/src/add-ons/kernel/generic/scsi_periph/Jamfile
index 5fd764c..ecc553e 100644
--- a/src/add-ons/kernel/generic/scsi_periph/Jamfile
+++ b/src/add-ons/kernel/generic/scsi_periph/Jamfile
@@ -1,6 +1,7 @@
SubDir HAIKU_TOP src add-ons kernel generic scsi_periph ;
-UsePrivateHeaders drivers kernel shared ;
+UsePrivateHeaders drivers ;
+UsePrivateKernelHeaders ;
SubDirHdrs $(HAIKU_TOP) src system kernel device_manager ;
# disable debug output, if debugging is disabled
diff --git
a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile
b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile
index b5caa11..a197820 100644
--- a/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile
+++ b/src/add-ons/kernel/network/datalink_protocols/ethernet_frame/Jamfile
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX
headers.
}
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
KernelAddon ethernet_frame :
ethernet_frame.cpp
diff --git
a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile
b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile
index fc60f3c..b034dda 100644
--- a/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile
+++ b/src/add-ons/kernel/network/datalink_protocols/loopback_frame/Jamfile
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX
headers.
}
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
KernelAddon loopback_frame :
loopback_frame.cpp
diff --git a/src/add-ons/kernel/network/devices/loopback/Jamfile
b/src/add-ons/kernel/network/devices/loopback/Jamfile
index 1bab85f..2b19f90 100644
--- a/src/add-ons/kernel/network/devices/loopback/Jamfile
+++ b/src/add-ons/kernel/network/devices/loopback/Jamfile
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX
headers.
}
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
KernelAddon loopback :
loopback.cpp
diff --git a/src/add-ons/kernel/network/protocols/icmp/Jamfile
b/src/add-ons/kernel/network/protocols/icmp/Jamfile
index 1c60062..8aadbba 100644
--- a/src/add-ons/kernel/network/protocols/icmp/Jamfile
+++ b/src/add-ons/kernel/network/protocols/icmp/Jamfile
@@ -1,7 +1,8 @@
SubDir HAIKU_TOP src add-ons kernel network protocols icmp ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ipv4 ]
;
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
KernelAddon icmp :
icmp.cpp
diff --git a/src/add-ons/kernel/network/protocols/icmp6/Jamfile
b/src/add-ons/kernel/network/protocols/icmp6/Jamfile
index 21c0520..6ff71bb 100644
--- a/src/add-ons/kernel/network/protocols/icmp6/Jamfile
+++ b/src/add-ons/kernel/network/protocols/icmp6/Jamfile
@@ -10,7 +10,8 @@ if $(TARGET_PLATFORM) != haiku {
# Unfortunately we get more than we want, namely all POSIX
headers.
}
-UsePrivateHeaders kernel net ;
+UsePrivateKernelHeaders ;
+UsePrivateHeaders net ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] :
true ;
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network
datalink_protocols ] : true ;
############################################################################
Revision: hrev46718
Commit: e1720098c681dcf5205732af1737e9a46b2eac11
URL: http://cgit.haiku-os.org/haiku/commit/?id=e172009
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Mon Jan 20 03:02:07 2014 UTC
kernel: No need for arch specific ifdefs in arch/atomic.h
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/arch/atomic.h
b/headers/private/kernel/arch/atomic.h
index 26ceb17..1a7781d 100644
--- a/headers/private/kernel/arch/atomic.h
+++ b/headers/private/kernel/arch/atomic.h
@@ -10,14 +10,7 @@
#include <KernelExport.h>
-
-#ifdef __x86_64__
-# include <arch/x86/64/atomic.h>
-#elif __INTEL__
-# include <arch/x86/32/atomic.h>
-#elif __POWERPC__
-# include <arch/ppc/arch_atomic.h>
-#endif
+#include <arch_atomic.h>
#endif // _KERNEL_ARCH_ATOMIC_H
diff --git a/headers/private/kernel/arch/x86/arch_atomic.h
b/headers/private/kernel/arch/x86/arch_atomic.h
new file mode 100644
index 0000000..08e7a47
--- /dev/null
+++ b/headers/private/kernel/arch/x86/arch_atomic.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2014, Paweł Dziepak, pdziepak@xxxxxxxxxxx.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef _KERNEL_ARCH_x86_ARCH_ATOMIC_H
+#define _KERNEL_ARCH_x86_ARCH_ATOMIC_H
+
+
+#ifdef __x86_64__
+# include <arch/x86/64/atomic.h>
+#else
+# include <arch/x86/32/atomic.h>
+#endif
+
+
+#endif // _KERNEL_ARCH_ATOMIC_H
+
Other related posts:
- » [haiku-commits] haiku: hrev46718 - headers/private/kernel/arch/x86 src/add-ons/kernel/file_systems headers/private/kernel/arch src/add-ons/kernel/drivers src/system/kernel/scheduler - pdziepak
