Mitsuru IWASAKI
17341d1011
Resolve conflicts arising from the ACPI CA 20021002 import.
2002-10-04 20:09:19 +00:00
Mitsuru IWASAKI
2bff3f6b33
This commit was generated by cvs2svn to compensate for changes in r104470,
...
which included commits to RCS files with non-trunk default branches.
2002-10-04 20:07:58 +00:00
Mitsuru IWASAKI
07a5b5c0b6
Vendor import of the Intel ACPI CA 20021002 drop.
2002-10-04 20:07:58 +00:00
Poul-Henning Kamp
7812d86f03
(This commit touches about 15 disk device drivers in a very consistent
...
and predictable way, and I apologize if I have gotten it wrong anywhere,
getting prior review on a patch like this is not feasible, considering
the number of people involved and hardware availability etc.)
If struct disklabel is the messenger: kill the messenger.
Inside struct disk we had a struct disklabel which disk drivers used to
communicate certain metrics to the disklayer above (GEOM or the disk
mini-layer). This commit changes this communication to use four
explicit fields instead.
Amongst the benefits is that the fields do not get overwritten by
wrong or bogus on-disk disklabels.
Once that is clear, <sys/disk.h> which is included in the drivers
no longer need to pull <sys/disklabel.h> and <sys/diskslice.h> in,
the few places that needs them, have gotten explicit #includes for
them.
The disklabel inside struct disk is now only for internal use in
the disk mini-layer, so instead of embedding it, we malloc it as
we need it.
This concludes (modulus any mistakes) the series of disklabel related
commits.
I belive it all amounts to a NOP for all the rest of you :-)
Sponsored by: DARPA & NAI Labs.
2002-09-20 19:36:05 +00:00
Poul-Henning Kamp
78bc4b68cc
Don't call dkunit() to find our unit number, it is in our softc.
...
Sponsored by: DARPA & NAI Labs.
2002-09-20 16:26:12 +00:00
Mitsuru IWASAKI
c4d2c0a1de
Fix kernel build breakage when ACPI_DEBUG option is specified.
2002-08-29 08:31:06 +00:00
Mitsuru IWASAKI
d62ab2f4a1
Resolve conflicts arising from the ACPI CA 20020815 import.
2002-08-29 01:52:27 +00:00
Mitsuru IWASAKI
2d12e67c7d
Vendor import of the Intel ACPI CA 20020815 drop.
2002-08-29 01:51:24 +00:00
Mitsuru IWASAKI
b7a95606db
This commit was generated by cvs2svn to compensate for changes in r102550,
...
which included commits to RCS files with non-trunk default branches.
2002-08-29 01:51:24 +00:00
Darren Reed
ecae20848a
Finally merge in the changes from ipfilter 3.4.29 to freebsd-current.
...
Main changes here are related to the ftp proxy and making that work better.
2002-08-28 13:41:36 +00:00
Archie Cobbs
7d151849d0
Don't use "NULL" when "0" is really meant.
...
But in this case, "-1" is really meant.
Reviewed by: darrenr
2002-08-23 20:07:19 +00:00
Mitsuru IWASAKI
173ff9844f
Prepare for importing newer version of ACPI CA.
2002-08-22 15:21:15 +00:00
Mitsuru IWASAKI
b69ed3f4c6
Resolve conflicts arising from the ACPI CA 20020725 import.
2002-07-30 19:35:32 +00:00
Mitsuru IWASAKI
da9df8d45e
Vendor import of the Intel ACPI CA 20020725 drop.
2002-07-30 19:33:39 +00:00
Mitsuru IWASAKI
432a633569
This commit was generated by cvs2svn to compensate for changes in r100966,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 19:33:39 +00:00
Mitsuru IWASAKI
98479b041b
Resolve conflicts arising from the ACPI CA 20020611 import.
2002-07-09 17:54:02 +00:00
Mitsuru IWASAKI
7174287062
Vendor import of the Intel ACPI CA 20020611 drop.
2002-07-09 17:51:31 +00:00
Mitsuru IWASAKI
155ce7bfa3
This commit was generated by cvs2svn to compensate for changes in r99679,
...
which included commits to RCS files with non-trunk default branches.
2002-07-09 17:51:31 +00:00
Mitsuru IWASAKI
74fc979a09
Resolve conflicts arising from the ACPI CA 20020404 import.
2002-06-30 17:53:12 +00:00
Mitsuru IWASAKI
3f12fee6bc
Vendor import of the Intel ACPI CA 200200404 drop.
2002-06-30 17:50:46 +00:00
Mitsuru IWASAKI
733e46c474
This commit was generated by cvs2svn to compensate for changes in r99146,
...
which included commits to RCS files with non-trunk default branches.
2002-06-30 17:50:46 +00:00
Mitsuru IWASAKI
0305323763
- Add sanity check for argument.
...
- Add new entry to stripdirs. The `generate' directory appeared in
acpica-unix-20020517.
2002-06-12 14:55:19 +00:00
Darren Reed
fde76f025d
Commit changes that happened in IPFilter versions 3.4.27 - 3.4.28
2002-06-07 08:56:30 +00:00
Darren Reed
7df187a3ad
Merge updates from 3.4.26 - 3.4.27.
2002-04-27 16:56:25 +00:00
Darren Reed
37d55dca34
bring in changes from 3.4.26.
2002-04-25 03:31:39 +00:00
Darren Reed
39252e7612
This commit was generated by cvs2svn to compensate for changes in r95415,
...
which included commits to RCS files with non-trunk default branches.
2002-04-25 03:23:53 +00:00
Darren Reed
43ba65e60d
Import IPFilter 3.4.26 kernel sources, including H.323 proxy.
...
Include the licence file for both IPFilter and the H.323 proxy (from QNX),
for convienence.
2002-04-25 03:23:53 +00:00
Darren Reed
13114a18ac
Import IPFilter 3.4.26 kernel sources, including H.323 proxy.
...
Include the licence file for both IPFilter and the H.323 proxy (from QNX),
for convienence.
2002-04-25 03:23:52 +00:00
Ruslan Ermilov
f791219e02
We don't need ip_ipsec_pxy.c in userland.
2002-03-26 13:42:09 +00:00
Alfred Perlstein
205c9d4c30
fix blockno printf formatting warnings.
2002-03-19 20:46:30 +00:00
Darren Reed
40c407243f
do not include the missing ip_h323_pxy.c
2002-03-19 15:14:18 +00:00
Darren Reed
b38f3fb061
fix conflicts (mostly damn rcs id's) generated by import
2002-03-19 11:44:16 +00:00
Darren Reed
b90bc1632d
This file is being removed pending the all clear on its licence by someone
...
else.
2002-03-19 11:42:12 +00:00
Darren Reed
76531d9f8d
Import IPFilter 3.4.25 (last version 3.4.20)
2002-03-19 11:30:23 +00:00
Darren Reed
f72fae2740
This commit was generated by cvs2svn to compensate for changes in r92680,
...
which included commits to RCS files with non-trunk default branches.
2002-03-19 11:30:21 +00:00
Darren Reed
28613e5584
Import IPFilter 3.4.25 (last version 3.4.20)
2002-03-19 11:30:21 +00:00
Doug Rabson
789327f183
Remove a couple of stray linuxisms to make this work for FreeBSD/ia64.
2002-03-18 10:16:57 +00:00
Mike Smith
fd87aacdcc
Merge local changes for the 20020308 ACPI CA update.
2002-03-16 02:23:30 +00:00
Mike Smith
6ff98c910d
Import of the 20020308 Intel ACPI CA update.
2002-03-16 02:18:13 +00:00
Mike Smith
f3964aad0d
This commit was generated by cvs2svn to compensate for changes in r92388,
...
which included commits to RCS files with non-trunk default branches.
2002-03-16 02:18:13 +00:00
Mike Smith
e7bb0990c0
Import of the 20020308 Intel ACPI CA update.
2002-03-16 02:18:04 +00:00
Mike Smith
6c3ac087b5
This commit was generated by cvs2svn to compensate for changes in r92386,
...
which included commits to RCS files with non-trunk default branches.
2002-03-16 02:18:04 +00:00
Mike Barcroft
27aba6a42a
Change two occurrences of HTONS() to use htons().
2002-02-28 09:56:31 +00:00
Peter Wemm
b4925b6514
Fix warning (unused variable)
...
Submitted by: LINT, -Werror
2002-02-27 23:32:45 +00:00
Mike Smith
e941505796
Move some debugger-only symbols around; this patch didn't make it into
...
the commit resolution for some reason. Fixes ACPI_DEBUG.
2002-02-24 07:51:46 +00:00
Mike Smith
afa56f0b6d
Resolve conflicts arising from the ACPI CA 20020217 import.
2002-02-23 05:16:34 +00:00
Mike Smith
857591c3aa
Vendor import of the Intel ACPI CA 20020217 drop.
2002-02-23 05:10:40 +00:00
Mike Smith
8f296b2e5d
This commit was generated by cvs2svn to compensate for changes in r91116,
...
which included commits to RCS files with non-trunk default branches.
2002-02-23 05:10:40 +00:00
Mike Smith
aafdbb39dc
Add a helper script used to take an Intel-supplied ACPI CA drop and make it
...
ready for importing. This should save me from my own over-cleanliness.
2002-02-08 02:16:45 +00:00
Alfred Perlstein
20125be8b1
Backout inclusion of queue.h since rev 1.38 sys/file.h now has it
...
included in the right order.
2002-01-14 09:07:15 +00:00