svn commit: r263964 - stable/10/sys/boot/common
Author: ae
Date: Mon Mar 31 09:34:46 2014
New Revision: 263964
URL: http://svnweb.freebsd.org/changeset/base/263964
Log:
MFC r263468:
When loader(8) inspects MBR, it chooses GPT as main partition table,
when MBR contains only PMBR entry or it is bootcamp-compatible.
If MBR has PMBR entry and some other, the loader rejects it.
Make these checks to be less strict. If loader decided that PMBR
isn't suitable for GPT, it will use MBR.
Reported by:Paul Thornton
Modified:
stable/10/sys/boot/common/part.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/boot/common/part.c
==
--- stable/10/sys/boot/common/part.cMon Mar 31 02:53:15 2014
(r263963)
+++ stable/10/sys/boot/common/part.cMon Mar 31 09:34:46 2014
(r263964)
@@ -634,7 +634,7 @@ ptable_open(void *dev, off_t sectors, ui
for (i = 0, count = 0; i NDOSPART; i++) {
if (dp[i].dp_flag != 0 dp[i].dp_flag != 0x80) {
DEBUG(invalid partition flag %x, dp[i].dp_flag);
- break;
+ goto out;
}
#ifdef LOADER_GPT_SUPPORT
if (dp[i].dp_typ == DOSPTYP_PMBR) {
@@ -646,15 +646,12 @@ ptable_open(void *dev, off_t sectors, ui
count++;
}
/* Do we have some invalid values? */
- if (i != NDOSPART ||
- (table-type == PTABLE_GPT count 1)) {
+ if (table-type == PTABLE_GPT count 1) {
if (dp[1].dp_typ != DOSPTYP_HFS) {
table-type = PTABLE_NONE;
- DEBUG(invalid values detected, ignore
- partition table);
- goto out;
- }
- DEBUG(Bootcamp detected);
+ DEBUG(Incorrect PMBR, ignore it);
+ } else
+ DEBUG(Bootcamp detected);
}
#ifdef LOADER_GPT_SUPPORT
if (table-type == PTABLE_GPT) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263965 - stable/9/sys/boot/common
Author: ae
Date: Mon Mar 31 09:37:11 2014
New Revision: 263965
URL: http://svnweb.freebsd.org/changeset/base/263965
Log:
MFC r263468:
When loader(8) inspects MBR, it chooses GPT as main partition table,
when MBR contains only PMBR entry or it is bootcamp-compatible.
If MBR has PMBR entry and some other, the loader rejects it.
Make these checks to be less strict. If loader decided that PMBR
isn't suitable for GPT, it will use MBR.
Reported by:Paul Thornton
Modified:
stable/9/sys/boot/common/part.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/boot/ (props changed)
Modified: stable/9/sys/boot/common/part.c
==
--- stable/9/sys/boot/common/part.c Mon Mar 31 09:34:46 2014
(r263964)
+++ stable/9/sys/boot/common/part.c Mon Mar 31 09:37:11 2014
(r263965)
@@ -634,7 +634,7 @@ ptable_open(void *dev, off_t sectors, ui
for (i = 0, count = 0; i NDOSPART; i++) {
if (dp[i].dp_flag != 0 dp[i].dp_flag != 0x80) {
DEBUG(invalid partition flag %x, dp[i].dp_flag);
- break;
+ goto out;
}
#ifdef LOADER_GPT_SUPPORT
if (dp[i].dp_typ == DOSPTYP_PMBR) {
@@ -646,15 +646,12 @@ ptable_open(void *dev, off_t sectors, ui
count++;
}
/* Do we have some invalid values? */
- if (i != NDOSPART ||
- (table-type == PTABLE_GPT count 1)) {
+ if (table-type == PTABLE_GPT count 1) {
if (dp[1].dp_typ != DOSPTYP_HFS) {
table-type = PTABLE_NONE;
- DEBUG(invalid values detected, ignore
- partition table);
- goto out;
- }
- DEBUG(Bootcamp detected);
+ DEBUG(Incorrect PMBR, ignore it);
+ } else
+ DEBUG(Bootcamp detected);
}
#ifdef LOADER_GPT_SUPPORT
if (table-type == PTABLE_GPT) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263966 - head/sys/netinet
Author: ae Date: Mon Mar 31 13:00:49 2014 New Revision: 263966 URL: http://svnweb.freebsd.org/changeset/base/263966 Log: Don't copy the MF flag from original IP header to ICMP error message. PR: 188092 MFC after:1 week Sponsored by: Yandex LLC Modified: head/sys/netinet/ip_icmp.c Modified: head/sys/netinet/ip_icmp.c == --- head/sys/netinet/ip_icmp.c Mon Mar 31 09:37:11 2014(r263965) +++ head/sys/netinet/ip_icmp.c Mon Mar 31 13:00:49 2014(r263966) @@ -348,6 +348,7 @@ stdreply: icmpelen = max(8, min(V_icmp_q nip-ip_hl = 5; nip-ip_p = IPPROTO_ICMP; nip-ip_tos = 0; + nip-ip_off = 0; icmp_reflect(m); freeit: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263967 - head/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Mon Mar 31 14:04:57 2014 New Revision: 263967 URL: http://svnweb.freebsd.org/changeset/base/263967 Log: Document r263140, removal of IPX. Sponsored by: The FreeBSD Foundation Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Mar 31 13:00:49 2014(r263966) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Mar 31 14:04:57 2014(r263967) @@ -191,7 +191,9 @@ sect3 xml:id=net-proto titleNetwork Protocols/title - paranbsp;/para + paraSupport for the IPX network transport protocol has + been removed, and will not be supported in os;nbsp;11 + and later releases./para /sect3 sect3 xml:id=disks ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263968 - head/sys/boot/i386/efi
Author: emaste
Date: Mon Mar 31 14:12:27 2014
New Revision: 263968
URL: http://svnweb.freebsd.org/changeset/base/263968
Log:
Merge r246607 by benno from projects/uefi
Use EFI types for EFI values (silences warnings).
EFI UINTN is actually a 64-bit type on 64-bit processors.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/boot/i386/efi/main.c
Modified: head/sys/boot/i386/efi/main.c
==
--- head/sys/boot/i386/efi/main.c Mon Mar 31 14:04:57 2014
(r263967)
+++ head/sys/boot/i386/efi/main.c Mon Mar 31 14:12:27 2014
(r263968)
@@ -273,7 +273,8 @@ COMMAND_SET(mode, mode, change or dis
static int
command_mode(int argc, char *argv[])
{
- unsigned int cols, rows, mode;
+ UINTN cols, rows;
+ unsigned int mode;
int i;
char *cp;
char rowenv[8];
@@ -327,8 +328,7 @@ command_nvram(int argc, char *argv[])
CHAR16 *data;
EFI_STATUS status;
EFI_GUID varguid = { 0,0,0,{0,0,0,0,0,0,0,0} };
- unsigned int varsz;
- unsigned int datasz;
+ UINTN varsz, datasz;
SIMPLE_TEXT_OUTPUT_INTERFACE *conout;
int i;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263969 - head/sys/netinet6
Author: ae Date: Mon Mar 31 14:27:22 2014 New Revision: 263969 URL: http://svnweb.freebsd.org/changeset/base/263969 Log: Don't generate an ICMPv6 error message if packet was consumed by filter. MFC after:1 week Sponsored by: Yandex LLC Modified: head/sys/netinet6/ip6_forward.c Modified: head/sys/netinet6/ip6_forward.c == --- head/sys/netinet6/ip6_forward.c Mon Mar 31 14:12:27 2014 (r263968) +++ head/sys/netinet6/ip6_forward.c Mon Mar 31 14:27:22 2014 (r263969) @@ -564,10 +564,8 @@ skip_routing: odst = ip6-ip6_dst; /* Run through list of hooks for output packets. */ error = pfil_run_hooks(V_inet6_pfil_hook, m, rt-rt_ifp, PFIL_OUT, NULL); - if (error != 0) - goto senderr; - if (m == NULL) - goto freecopy; + if (error != 0 || m == NULL) + goto freecopy; /* consumed by filter */ ip6 = mtod(m, struct ip6_hdr *); /* See if destination IP address was changed by packet filter. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263971 - head/sys/netinet6
Author: ae
Date: Mon Mar 31 14:40:35 2014
New Revision: 263971
URL: http://svnweb.freebsd.org/changeset/base/263971
Log:
Remove unused label.
MFC after:1 week
Modified:
head/sys/netinet6/ip6_forward.c
Modified: head/sys/netinet6/ip6_forward.c
==
--- head/sys/netinet6/ip6_forward.c Mon Mar 31 14:39:56 2014
(r263970)
+++ head/sys/netinet6/ip6_forward.c Mon Mar 31 14:40:35 2014
(r263971)
@@ -634,7 +634,6 @@ pass:
}
}
-senderr:
if (mcopy == NULL)
goto out;
switch (error) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263972 - stable/10/share/man/man9
Author: asomers Date: Mon Mar 31 14:51:45 2014 New Revision: 263972 URL: http://svnweb.freebsd.org/changeset/base/263972 Log: MFC r263271 share/man/man9/counter.9 Fix logic error in the description of counter_u64_alloc: the command may fail only if M_NOWAIT is specified, not M_WAITOK. Modified: stable/10/share/man/man9/counter.9 Directory Properties: stable/10/ (props changed) Modified: stable/10/share/man/man9/counter.9 == --- stable/10/share/man/man9/counter.9 Mon Mar 31 14:40:35 2014 (r263971) +++ stable/10/share/man/man9/counter.9 Mon Mar 31 14:51:45 2014 (r263972) @@ -91,7 +91,7 @@ wait flag, should be either or .Va M_WAITOK . If -.Va M_WAITOK +.Va M_NOWAIT is specified the operation may fail. .It Fn counter_u64_free c Free the previously allocated counter ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263973 - head/sys/ddb
Author: pfg
Date: Mon Mar 31 16:37:41 2014
New Revision: 263973
URL: http://svnweb.freebsd.org/changeset/base/263973
Log:
ddb: Minor style cleanups.
#define should be followed by tab.
MFC after:1 week
Modified:
head/sys/ddb/db_break.h
head/sys/ddb/db_sym.h
head/sys/ddb/db_variables.h
head/sys/ddb/ddb.h
Modified: head/sys/ddb/db_break.h
==
--- head/sys/ddb/db_break.h Mon Mar 31 14:51:45 2014(r263972)
+++ head/sys/ddb/db_break.h Mon Mar 31 16:37:41 2014(r263973)
@@ -38,7 +38,7 @@
*/
#ifndef BKPT_INST_TYPE
-#define BKPT_INST_TYPE int
+#defineBKPT_INST_TYPE int
#endif
struct db_breakpoint {
Modified: head/sys/ddb/db_sym.h
==
--- head/sys/ddb/db_sym.h Mon Mar 31 14:51:45 2014(r263972)
+++ head/sys/ddb/db_sym.h Mon Mar 31 16:37:41 2014(r263973)
@@ -63,8 +63,8 @@ typedef const char *c_db_sym_t; /* cons
typedef intdb_strategy_t; /* search strategy */
#defineDB_STGY_ANY 0 /* anything goes */
-#define DB_STGY_XTRN 1 /* only external symbols */
-#define DB_STGY_PROC 2 /* only procedures */
+#defineDB_STGY_XTRN1 /* only external
symbols */
+#defineDB_STGY_PROC2 /* only procedures */
/*
* Functions exported by the symtable module
@@ -78,11 +78,11 @@ c_db_sym_t db_search_symbol(db_addr_t, d
void db_symbol_values(c_db_sym_t, const char **, db_expr_t *);
/* return name and value of symbol */
-#define db_find_sym_and_offset(val,namep,offp) \
+#definedb_find_sym_and_offset(val,namep,offp) \
db_symbol_values(db_search_symbol(val,DB_STGY_ANY,offp),namep,0)
/* find namevalue given approx val */
-#define db_find_xtrn_sym_and_offset(val,namep,offp)\
+#definedb_find_xtrn_sym_and_offset(val,namep,offp) \
db_symbol_values(db_search_symbol(val,DB_STGY_XTRN,offp),namep,0)
/* ditto, but no locals */
Modified: head/sys/ddb/db_variables.h
==
--- head/sys/ddb/db_variables.h Mon Mar 31 14:51:45 2014(r263972)
+++ head/sys/ddb/db_variables.h Mon Mar 31 16:37:41 2014(r263973)
@@ -44,8 +44,8 @@ struct db_variable {
db_expr_t *valuep; /* value of variable */
/* function to call when reading/writing */
db_varfcn_t *fcn;
-#define DB_VAR_GET 0
-#define DB_VAR_SET 1
+#defineDB_VAR_GET 0
+#defineDB_VAR_SET 1
};
#defineFCN_NULL((db_varfcn_t *)0)
Modified: head/sys/ddb/ddb.h
==
--- head/sys/ddb/ddb.h Mon Mar 31 14:51:45 2014(r263972)
+++ head/sys/ddb/ddb.h Mon Mar 31 16:37:41 2014(r263973)
@@ -118,7 +118,7 @@ struct command {
* in modules in which case they will be available only when
* the module is loaded.
*/
-#define _DB_SET(_suffix, _name, _func, list, _flag, _more) \
+#define_DB_SET(_suffix, _name, _func, list, _flag, _more) \
static struct command __CONCAT(_name,_suffix) = { \
.name = __STRING(_name), \
.fcn= _func,\
@@ -145,27 +145,27 @@ SYSUNINIT(__CONCAT(_name,_suffix), SI_SU
* This macro is mostly used to define commands placed in one of
* the ddb command tables; see DB_COMMAND, etc. below.
*/
-#define _DB_FUNC(_suffix, _name, _func, list, _flag, _more)\
+#define_DB_FUNC(_suffix, _name, _func, list, _flag, _more) \
static db_cmdfcn_t _func; \
_DB_SET(_suffix, _name, _func, list, _flag, _more);\
static void\
_func(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif)
/* common idom provided for backwards compatibility */
-#define DB_FUNC(_name, _func, list, _flag, _more) \
+#defineDB_FUNC(_name, _func, list, _flag, _more) \
_DB_FUNC(_cmd, _name, _func, list, _flag, _more)
-#define DB_COMMAND(cmd_name, func_name) \
+#defineDB_COMMAND(cmd_name, func_name) \
_DB_FUNC(_cmd, cmd_name, func_name, db_cmd_table, 0, NULL)
-#define DB_ALIAS(alias_name, func_name) \
+#defineDB_ALIAS(alias_name, func_name) \
_DB_SET(_cmd, alias_name, func_name, db_cmd_table, 0, NULL)
-#define DB_SHOW_COMMAND(cmd_name, func_name) \
+#defineDB_SHOW_COMMAND(cmd_name, func_name) \
_DB_FUNC(_show, cmd_name, func_name,
svn commit: r263974 - in head/contrib/jemalloc: . doc include/jemalloc include/jemalloc/internal src
Author: jasone Date: Mon Mar 31 17:04:04 2014 New Revision: 263974 URL: http://svnweb.freebsd.org/changeset/base/263974 Log: Update jemalloc to version 3.6.0. Modified: head/contrib/jemalloc/ChangeLog head/contrib/jemalloc/FREEBSD-diffs head/contrib/jemalloc/VERSION head/contrib/jemalloc/doc/jemalloc.3 head/contrib/jemalloc/include/jemalloc/internal/hash.h head/contrib/jemalloc/include/jemalloc/internal/huge.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h head/contrib/jemalloc/include/jemalloc/internal/private_namespace.h head/contrib/jemalloc/include/jemalloc/jemalloc.h head/contrib/jemalloc/src/arena.c head/contrib/jemalloc/src/huge.c head/contrib/jemalloc/src/jemalloc.c head/contrib/jemalloc/src/prof.c Modified: head/contrib/jemalloc/ChangeLog == --- head/contrib/jemalloc/ChangeLog Mon Mar 31 16:37:41 2014 (r263973) +++ head/contrib/jemalloc/ChangeLog Mon Mar 31 17:04:04 2014 (r263974) @@ -5,6 +5,30 @@ found in the git revision history: https://github.com/jemalloc/jemalloc +* 3.6.0 (March 31, 2014) + + This version contains a critical bug fix for a regression present in 3.5.0 and + 3.5.1. + + Bug fixes: + - Fix a regression in arena_chunk_alloc() that caused crashes during +small/large allocation if chunk allocation failed. In the absence of this +bug, chunk allocation failure would result in allocation failure, e.g. NULL +return from malloc(). This regression was introduced in 3.5.0. + - Fix backtracing for gcc intrinsics-based backtracing by specifying +-fno-omit-frame-pointer to gcc. Note that the application (and all the +libraries it links to) must also be compiled with this option for +backtracing to be reliable. + - Use dss allocation precedence for huge allocations as well as small/large +allocations. + - Fix test assertion failure message formatting. This bug did not manifect on +x86_64 systems because of implementation subtleties in va_list. + - Fix inconsequential test failures for hash and SFMT code. + + New features: + - Support heap profiling on FreeBSD. This feature depends on the proc +filesystem being mounted during heap profile dumping. + * 3.5.1 (February 25, 2014) This version primarily addresses minor bugs in test code. Modified: head/contrib/jemalloc/FREEBSD-diffs == --- head/contrib/jemalloc/FREEBSD-diffs Mon Mar 31 16:37:41 2014 (r263973) +++ head/contrib/jemalloc/FREEBSD-diffs Mon Mar 31 17:04:04 2014 (r263974) @@ -1,5 +1,5 @@ diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in -index c7e2e87..2bd59f0 100644 +index d8e2e71..330ba2a 100644 --- a/doc/jemalloc.xml.in +++ b/doc/jemalloc.xml.in @@ -57,12 +57,23 @@ @@ -27,7 +27,7 @@ index c7e2e87..2bd59f0 100644 refsect2 titleStandard API/title funcprototype -@@ -2338,4 +2349,19 @@ malloc_conf = lg_chunk:24;]]/programlisting/para +@@ -2342,4 +2353,19 @@ malloc_conf = lg_chunk:24;]]/programlisting/para paraThe functionposix_memalignparameter//function function conforms to IEEE Std 1003.1-2001 (ldquo;POSIX.1rdquo;)./para /refsect1 @@ -48,7 +48,7 @@ index c7e2e87..2bd59f0 100644 + /refsect1 /refentry diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index d24a1fe..d101c3d 100644 +index 574bbb1..e3eafdf 100644 --- a/include/jemalloc/internal/jemalloc_internal.h.in +++ b/include/jemalloc/internal/jemalloc_internal.h.in @@ -1,5 +1,8 @@ @@ -100,10 +100,10 @@ index de44e14..564d604 100644 bool malloc_mutex_init(malloc_mutex_t *mutex); diff --git a/include/jemalloc/internal/private_symbols.txt b/include/jemalloc/internal/private_symbols.txt -index 1e64ed5..29ddba3 100644 +index 93516d2..22f9af9 100644 --- a/include/jemalloc/internal/private_symbols.txt +++ b/include/jemalloc/internal/private_symbols.txt -@@ -225,7 +225,6 @@ iralloc +@@ -226,7 +226,6 @@ iralloc iralloct iralloct_realign isalloc @@ -263,7 +263,7 @@ index f943891..47d032c 100755 +#include jemalloc_FreeBSD.h EOF diff --git a/src/jemalloc.c b/src/jemalloc.c -index 563d99f..42f97b4 100644 +index 204778b..9e5f2df 100644 --- a/src/jemalloc.c +++ b/src/jemalloc.c @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL) Modified: head/contrib/jemalloc/VERSION == --- head/contrib/jemalloc/VERSION Mon Mar 31 16:37:41 2014 (r263973) +++ head/contrib/jemalloc/VERSION Mon Mar 31 17:04:04 2014 (r263974) @@ -1 +1 @@ -3.5.1-0-g7709a64c59daf0b1f938be49472fcc499e1bd136 +3.6.0-0-g46c0af68bd248b04df75e4f92d5fb804c3d75340 Modified:
svn commit: r263975 - head/sys/dev/acpica
Author: imp Date: Mon Mar 31 19:37:39 2014 New Revision: 263975 URL: http://svnweb.freebsd.org/changeset/base/263975 Log: Turns out name was used here when ACPI_DEBUG was defined, so refine my previous patch. Modified: head/sys/dev/acpica/acpi_resource.c Modified: head/sys/dev/acpica/acpi_resource.c == --- head/sys/dev/acpica/acpi_resource.c Mon Mar 31 17:04:04 2014 (r263974) +++ head/sys/dev/acpica/acpi_resource.c Mon Mar 31 19:37:39 2014 (r263975) @@ -183,6 +183,9 @@ acpi_parse_resource(ACPI_RESOURCE *res, struct acpi_parse_resource_set *set; struct acpi_resource_context *arc; UINT64 min, max, length, gran; +#ifdef ACPI_DEBUG +const char *name; +#endif device_t dev; arc = context; @@ -299,18 +302,27 @@ acpi_parse_resource(ACPI_RESOURCE *res, min = res-Data.Address16.Minimum; max = res-Data.Address16.Maximum; length = res-Data.Address16.AddressLength; +#ifdef ACPI_DEBUG + name = Address16; +#endif break; case ACPI_RESOURCE_TYPE_ADDRESS32: gran = res-Data.Address32.Granularity; min = res-Data.Address32.Minimum; max = res-Data.Address32.Maximum; length = res-Data.Address32.AddressLength; +#ifdef ACPI_DEBUG + name = Address32; +#endif break; case ACPI_RESOURCE_TYPE_ADDRESS64: gran = res-Data.Address64.Granularity; min = res-Data.Address64.Minimum; max = res-Data.Address64.Maximum; length = res-Data.Address64.AddressLength; +#ifdef ACPI_DEBUG + name = Address64; +#endif break; default: KASSERT(res-Type == ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64, @@ -319,6 +331,9 @@ acpi_parse_resource(ACPI_RESOURCE *res, min = res-Data.ExtAddress64.Minimum; max = res-Data.ExtAddress64.Maximum; length = res-Data.ExtAddress64.AddressLength; +#ifdef ACPI_DEBUG + name = ExtAddress64; +#endif break; } if (length = 0) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263978 - head/sys/cam/ctl
Author: trasz
Date: Mon Mar 31 20:49:33 2014
New Revision: 263978
URL: http://svnweb.freebsd.org/changeset/base/263978
Log:
Make it possible to have multiple CTL worker threads. Leave the default
of 1 for now.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Mon Mar 31 19:58:08 2014(r263977)
+++ head/sys/cam/ctl/ctl.c Mon Mar 31 20:49:33 2014(r263978)
@@ -60,6 +60,7 @@ __FBSDID($FreeBSD$);
#include sys/ioccom.h
#include sys/queue.h
#include sys/sbuf.h
+#include sys/smp.h
#include sys/endian.h
#include sys/sysctl.h
@@ -320,6 +321,10 @@ static int ctl_is_single = 1;
static int index_to_aps_page;
SYSCTL_NODE(_kern_cam, OID_AUTO, ctl, CTLFLAG_RD, 0, CAM Target Layer);
+static int worker_threads = 1;
+TUNABLE_INT(kern.cam.ctl.worker_threads, worker_threads);
+SYSCTL_INT(_kern_cam_ctl, OID_AUTO, worker_threads, CTLFLAG_RDTUN,
+worker_threads, 1, Number of worker threads);
/*
* Serial number (0x80), device id (0x83), and supported pages (0x00)
@@ -950,10 +955,7 @@ ctl_init(void)
struct ctl_frontend *fe;
struct ctl_lun *lun;
uint8_t sc_id =0;
-#if 0
- int i;
-#endif
- int error, retval;
+ int i, error, retval;
//int isc_retval;
retval = 0;
@@ -1085,17 +1087,35 @@ ctl_init(void)
mtx_unlock(softc-ctl_lock);
#endif
- error = kproc_create(ctl_work_thread, softc, softc-work_thread, 0, 0,
-ctl_thrd);
- if (error != 0) {
- printf(error creating CTL work thread!\n);
- mtx_lock(softc-ctl_lock);
- ctl_free_lun(lun);
- mtx_unlock(softc-ctl_lock);
- ctl_pool_free(internal_pool);
- ctl_pool_free(emergency_pool);
- ctl_pool_free(other_pool);
- return (error);
+ if (worker_threads MAXCPU || worker_threads == 0) {
+ printf(invalid kern.cam.ctl.worker_threads value;
+ setting to 1);
+ worker_threads = 1;
+ } else if (worker_threads 0) {
+ if (mp_ncpus 2) {
+ /*
+* Using more than two worker threads actually hurts
+* performance due to lock contention.
+*/
+ worker_threads = 2;
+ } else {
+ worker_threads = 1;
+ }
+ }
+
+ for (i = 0; i worker_threads; i++) {
+ error = kproc_create(ctl_work_thread, softc,
softc-work_thread, 0, 0,
+ ctl_thrd%d, i);
+ if (error != 0) {
+ printf(error creating CTL work thread!\n);
+ mtx_lock(softc-ctl_lock);
+ ctl_free_lun(lun);
+ mtx_unlock(softc-ctl_lock);
+ ctl_pool_free(internal_pool);
+ ctl_pool_free(emergency_pool);
+ ctl_pool_free(other_pool);
+ return (error);
+ }
}
if (bootverbose)
printf(ctl: CAM Target Layer loaded\n);
@@ -12991,7 +13011,11 @@ ctl_work_thread(void *arg)
if (io != NULL) {
STAILQ_REMOVE_HEAD(softc-rtr_queue, links);
mtx_unlock(softc-ctl_lock);
- goto execute;
+ retval = ctl_scsiio(io-scsiio);
+ if (retval != CTL_RETVAL_COMPLETE)
+ CTL_DEBUG_PRINT((ctl_scsiio
failed\n));
+ mtx_lock(softc-ctl_lock);
+ continue;
}
}
io = (union ctl_io *)STAILQ_FIRST(softc-incoming_queue);
@@ -13022,19 +13046,6 @@ ctl_work_thread(void *arg)
/* Back to the top of the loop to see what woke us up. */
continue;
-
-execute:
- retval = ctl_scsiio(io-scsiio);
- switch (retval) {
- case CTL_RETVAL_COMPLETE:
- break;
- default:
- /*
-* Probably need to make sure this doesn't happen.
-*/
- break;
- }
- mtx_lock(softc-ctl_lock);
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263949 - head
On Sun, Mar 30, 2014 at 10:24:37PM +, Warner Losh wrote: Author: imp Date: Sun Mar 30 22:24:37 2014 New Revision: 263949 URL: http://svnweb.freebsd.org/changeset/base/263949 Log: When building g++, we need to build libsupc earlier to avoid a race with libproc. Not sure why people didn't see this before now, but I get it often for higher (20-30) -j builds, but never for -j1 builds. Thanks Warner! I bumped into this on Friday afternoon and didn't quite get to the point of characterizing it. -- Brooks pgpVxcyZ3y4UO.pgp Description: PGP signature
svn commit: r263979 - head/sys/cam/ctl
Author: trasz
Date: Mon Mar 31 21:04:15 2014
New Revision: 263979
URL: http://svnweb.freebsd.org/changeset/base/263979
Log:
Hide CTL messages about SCSI error responses. Too many users take
them for actual target errors. They can be enabled back by setting
kern.cam.ctl.verbose=1, or booting with bootverbose.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Mon Mar 31 20:49:33 2014(r263978)
+++ head/sys/cam/ctl/ctl.c Mon Mar 31 21:04:15 2014(r263979)
@@ -325,6 +325,10 @@ static int worker_threads = 1;
TUNABLE_INT(kern.cam.ctl.worker_threads, worker_threads);
SYSCTL_INT(_kern_cam_ctl, OID_AUTO, worker_threads, CTLFLAG_RDTUN,
worker_threads, 1, Number of worker threads);
+static int verbose = 0;
+TUNABLE_INT(kern.cam.ctl.verbose, verbose);
+SYSCTL_INT(_kern_cam_ctl, OID_AUTO, verbose, CTLFLAG_RWTUN,
+verbose, 0, Show SCSI errors returned to initiator);
/*
* Serial number (0x80), device id (0x83), and supported pages (0x00)
@@ -12349,7 +12353,8 @@ ctl_process_done(union ctl_io *io, int h
case CTL_IO_SCSI:
break;
case CTL_IO_TASK:
- ctl_io_error_print(io, NULL);
+ if (bootverbose || verbose 0)
+ ctl_io_error_print(io, NULL);
if (io-io_hdr.flags CTL_FLAG_FROM_OTHER_SC)
ctl_free_io(io);
else
@@ -12605,7 +12610,8 @@ ctl_process_done(union ctl_io *io, int h
skipped, skipped_prints);
#endif
}
- ctl_io_error_print(io, NULL);
+ if (bootverbose || verbose 0)
+ ctl_io_error_print(io, NULL);
}
} else {
if (have_lock == 0)
@@ -12616,7 +12622,8 @@ ctl_process_done(union ctl_io *io, int h
case CTL_IO_TASK:
if (have_lock == 0)
mtx_unlock(ctl_softc-ctl_lock);
- ctl_io_error_print(io, NULL);
+ if (bootverbose || verbose 0)
+ ctl_io_error_print(io, NULL);
break;
default:
if (have_lock == 0)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263859 - head/sys/x86/acpica
On Thursday, March 27, 2014 10:38:14 pm Takanori Watanabe wrote: Author: takawata Date: Fri Mar 28 02:38:14 2014 New Revision: 263859 URL: http://svnweb.freebsd.org/changeset/base/263859 Log: Change default logic to CONFORM because this routine is shared with SCI polarity setting. Reviewed by: jhb Thanks! -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263979 - in head: . contrib usr.bin
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 On 03/31/14 17:01, Glen Barber wrote: Author: gjb Date: Tue Apr 1 00:01:56 2014 New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. Yay! Now we can import OpenJDK too ;-) Cheers, - -- Xin LI delp...@delphij.nethttps://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCgAGBQJTOgTSAAoJEJW2GBstM+nsF7YQAKLY4xRdPJY+bLimrabG0qxD JGtkjIm/NMUapPiLF2JqbAm4Kg+7h+a40w96PydBPsTCpgoK0lT/KGf6pOPb9sLm yrd3TDKB5hxGUyaewbKcEGv8tj+f9FgslGxvfyGvMV5xTRs6I4eLYYd6ggKM07Sr gozO4cvffq0OX+6M6RJlzBUSp6PiD8laKhFGyZff0zgXUd039CKJle3g5Q2Q0gcj LY16bVOgm6QJV4jwBaBaW2eaZDJK6XpynKW89fiSZ+d1DqQ6OoGmCHbCD6zXvPem UlGuBTkL4CufmPkZry9QKhLmyRtgrzm+GZ8/Y3ho0HkIr8/DCq06s+rhxFleOCtz AO4wnZSjEpPbYHtZDFySDH6j57Ru8jrVYKSVJyUfIJ9QU2uM5lQyt3anCTHek7BM PU+MKu7Cdk595SPj5L33Y5draBj9U/c74iJZm6qgi6IsSJxsr+C2RlORO7cH1/vZ swXZxDJR+pOOZUCRYo+dMWTYAwyQlmMHGsh8WbdRjPc62OfBOSQtc7suI9VIIr0Y 3xHXf7OApmK55sPkKMkgiNT4+aO5UyF9MQoUlJt8qCN8LHXvE54i0btJuwRmS/9/ DJVPdeZKbcfqdKv9tdB3gn3Z3ea+H2Zza5DyWgClcjrebUtuB+VVg4Y25NiAB9O8 8E6JnPHRuNqS6I9Dgn81 =XZ7D -END PGP SIGNATURE- ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263980 - in stable/10: . usr.sbin/bsdconfig usr.sbin/bsdconfig/share usr.sbin/bsdconfig/timezone/share usr.sbin/bsdconfig/usermgmt usr.sbin/bsdconfig/usermgmt/include usr.sbin/bsdconfi...
Author: dteske Date: Tue Apr 1 00:19:13 2014 New Revision: 263980 URL: http://svnweb.freebsd.org/changeset/base/263980 Log: MFC revisions 260894,260899,262895-262902,262904,262908-262910,262982, 262984,263133-263137,263139,263141,263144-263150, and (partially) 263249 (31 revisions; summarized below)... r260894: Optimize f_expand_number(), improving performance r260899: s/__number/__num/ in f_expand_number() r262895: Allow dispatched reswords to carry arguments r262896: Add missing local declaration r262897: Fix a typo in a comment r262898: Fix incorrect return status if var_to_set and var_to_get are same r262899: Make f_show_err non-fatal r262900: Centralize function name; Update a comment while here r262901: s/__num/__number/ in f_expand_number() r262902: Comment to go with NL global introduced by previous commit r262904: Rewrite groupmgmt -- hooking it into the scripting system r262908: Change dispatch words from group* to *Group for backward compat r262909: Fix copy/paste error in a comment r262910: Take a group name on the command-line if available r262982: Whitespace r262984: Remove vestigial global, no longer used since r262904 r263133: Remove indexfile from debug statement (already logged) r263134: Add debug statement just before attempting to exec a module r263135: Comments r263136: Update copyright r263137: Fix future namespace issues for functions taking $var_to_set r263139: Remove useless NULL string in compound strings r263141: Pointy hat! Fix a broken f_isinteger() r263144: Fix a code-typo that prevented auto-sizing of a dialog r263145: Fix comments and whitespace r263146: Reduce the sleep cycle when using dialog(1) [infobox] to 1-second r263147: Fix a bug preventing errors from pw(8) from appearing r263148: For non-interactive scripts, forgot to check argument r263149: Add protection against input containing single-quotes r263150: Rewrite usermgmt r263249: (partial) Add more obsolete files Added: stable/10/usr.sbin/bsdconfig/usermgmt/share/group.subr - copied, changed from r262904, head/usr.sbin/bsdconfig/usermgmt/share/group.subr stable/10/usr.sbin/bsdconfig/usermgmt/share/user.subr - copied unchanged from r263150, head/usr.sbin/bsdconfig/usermgmt/share/user.subr Deleted: stable/10/usr.sbin/bsdconfig/usermgmt/groupinput stable/10/usr.sbin/bsdconfig/usermgmt/userinput Modified: stable/10/ObsoleteFiles.inc stable/10/usr.sbin/bsdconfig/bsdconfig stable/10/usr.sbin/bsdconfig/share/common.subr stable/10/usr.sbin/bsdconfig/share/device.subr stable/10/usr.sbin/bsdconfig/share/dialog.subr stable/10/usr.sbin/bsdconfig/share/keymap.subr stable/10/usr.sbin/bsdconfig/share/script.subr stable/10/usr.sbin/bsdconfig/share/strings.subr stable/10/usr.sbin/bsdconfig/share/variable.subr stable/10/usr.sbin/bsdconfig/timezone/share/menus.subr stable/10/usr.sbin/bsdconfig/usermgmt/Makefile stable/10/usr.sbin/bsdconfig/usermgmt/groupadd stable/10/usr.sbin/bsdconfig/usermgmt/groupdel stable/10/usr.sbin/bsdconfig/usermgmt/groupedit stable/10/usr.sbin/bsdconfig/usermgmt/include/messages.subr stable/10/usr.sbin/bsdconfig/usermgmt/share/Makefile stable/10/usr.sbin/bsdconfig/usermgmt/share/group_input.subr stable/10/usr.sbin/bsdconfig/usermgmt/share/user_input.subr stable/10/usr.sbin/bsdconfig/usermgmt/useradd stable/10/usr.sbin/bsdconfig/usermgmt/userdel stable/10/usr.sbin/bsdconfig/usermgmt/useredit Directory Properties: stable/10/ (props changed) Modified: stable/10/ObsoleteFiles.inc == --- stable/10/ObsoleteFiles.inc Mon Mar 31 21:04:15 2014(r263979) +++ stable/10/ObsoleteFiles.inc Tue Apr 1 00:19:13 2014(r263980) @@ -75,6 +75,10 @@ OLD_FILES+=usr/include/clang/3.3/xopintr OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz OLD_DIRS+=usr/include/clang/3.3 +# 20140314: bsdconfig usermgmt rewrite +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/userinput +# 20140307: bsdconfig groupmgmt rewrite +OLD_FILES+=usr/libexec/bsdconfig/070.usermgmt/groupinput # 20131109: extattr(2) mlinks fixed OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz Modified: stable/10/usr.sbin/bsdconfig/bsdconfig == --- stable/10/usr.sbin/bsdconfig/bsdconfig Mon Mar 31 21:04:15 2014 (r263979) +++ stable/10/usr.sbin/bsdconfig/bsdconfig Tue Apr 1 00:19:13 2014 (r263980) @@ -1,7 +1,7 @@ #!/bin/sh #- # Copyright (c) 2012 Ron McDowell -# Copyright (c) 2012-2013 Devin Teske +# Copyright (c) 2012-2014 Devin Teske # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -315,8 +315,7 @@ if [ $pgm != bsdconfig ]; then if indexfile=$( f_index_file $pgm ) cmd=$(
Re: svn commit: r263979 - in head: . contrib usr.bin
On Mon, Mar 31, 2014 at 08:01:30PM -0400, Glen Barber wrote: Author: gjb Date: Tue Apr 1 00:01:56 2014 New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. head/contrib/ruby19/enc/utf_8.c Shouldn't this have been head/contrib/ruby? None of the other contrib directories encode the version number. -- steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263979 - in head: . contrib usr.bin
On Mon, Mar 31, 2014 at 05:56:10PM -0700, Steve Kargl wrote: On Mon, Mar 31, 2014 at 08:01:30PM -0400, Glen Barber wrote: Author: gjb Date: Tue Apr 1 00:01:56 2014 New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. head/contrib/ruby19/enc/utf_8.c Shouldn't this have been head/contrib/ruby? None of the other contrib directories encode the version number. I'm not sure this is an official policy, since the binary installs as /usr/bin/ruby. Glen pgplv2NQtdwdD.pgp Description: PGP signature
svn commit: r263981 - in head: lib/libc/gen sys/kern sys/sys
Author: mjg
Date: Tue Apr 1 03:20:35 2014
New Revision: 263981
URL: http://svnweb.freebsd.org/changeset/base/263981
Log:
Add a new errno: EMACS - Editor too big.
Make a best-effort to detect that Emacs is about to executed and return
the error.
MFC after:1 week
Modified:
head/lib/libc/gen/errlst.c
head/sys/kern/kern_exec.c
head/sys/sys/errno.h
Modified: lib/libc/gen/errlst.c
===
--- head/lib/libc/gen/errlst.c (263980)
+++ head/lib/libc/gen/errlst.c (263981)
@@ -155,6 +155,7 @@
Not permitted in capability mode, /* 94 - ECAPMODE */
State not recoverable,/* 95 - ENOTRECOVERABLE */
Previous owner died, /* 96 - EOWNERDEAD */
+ Editor too big, /* 97 - EMACS */
};
const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
Modified: sys/kern/kern_exec.c
===
--- head/sys/kern/kern_exec.c (263980)
+++ head/sys/kern/kern_exec.c (263981)
@@ -337,6 +337,7 @@
int (*img_first)(struct image_params *);
struct pargs *oldargs = NULL, *newargs = NULL;
struct sigacts *oldsigacts, *newsigacts;
+ char *e;
#ifdef KTRACE
struct vnode *tracevp = NULL;
struct ucred *tracecred = NULL;
@@ -418,6 +419,19 @@
SDT_PROBE(proc, kernel, , exec, args-fname, 0, 0, 0, 0 );
+ /*
+* A best-effort to check whether the file to be run is EMACS
+*/
+ if (args-fname != NULL) {
+ e = args-fname + strlen(args-fname);
+ while (e args-fname *e != '/')
+ e--;
+ if (strcasecmp(e, /emacs) == 0) {
+ error = EMACS;
+ goto exec_fail;
+ }
+ }
+
interpret:
if (args-fname != NULL) {
#ifdef CAPABILITY_MODE
Modified: sys/sys/errno.h
===
--- head/sys/sys/errno.h(263980)
+++ head/sys/sys/errno.h(263981)
@@ -178,10 +178,11 @@
#defineECAPMODE94 /* Not permitted in capability
mode */
#defineENOTRECOVERABLE 95 /* State not recoverable */
#defineEOWNERDEAD 96 /* Previous owner died */
+#defineEMACS 97 /* Editor too big */
#endif /* _POSIX_SOURCE */
#ifndef _POSIX_SOURCE
-#defineELAST 96 /* Must be equal largest errno
*/
+#defineELAST 97 /* Must be equal largest errno
*/
#endif /* _POSIX_SOURCE */
#ifdef _KERNEL
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263979 - in head: . contrib usr.bin
On Mon, Mar 31, 2014 at 05:14:10PM -0700, Xin Li wrote: On 03/31/14 17:01, Glen Barber wrote: New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. Yay! Now we can import OpenJDK too ;-) I won't be exactly surprized when^Wif we do it one day. ./danfe ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263979 - in head: . contrib usr.bin
On Mon, Mar 31, 2014 at 08:58:42PM -0400, Glen Barber wrote: On Mon, Mar 31, 2014 at 05:56:10PM -0700, Steve Kargl wrote: On Mon, Mar 31, 2014 at 08:01:30PM -0400, Glen Barber wrote: Author: gjb Date: Tue Apr 1 00:01:56 2014 New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. head/contrib/ruby19/enc/utf_8.c Shouldn't this have been head/contrib/ruby? None of the other contrib directories encode the version number. I'm not sure this is an official policy, since the binary installs as /usr/bin/ruby. I did a quick search, but didn't find anything either. But, down the road when someone upgrades to ruby 2.0, we now have head/contrib/ruby20 or a svn mv ruby19 to head/contrib/ruby. -- Steve ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r263979 - in head: . contrib usr.bin
On Mon, Mar 31, 2014 at 06:31:15PM -0700, Steve Kargl wrote: On Mon, Mar 31, 2014 at 08:58:42PM -0400, Glen Barber wrote: On Mon, Mar 31, 2014 at 05:56:10PM -0700, Steve Kargl wrote: On Mon, Mar 31, 2014 at 08:01:30PM -0400, Glen Barber wrote: Author: gjb Date: Tue Apr 1 00:01:56 2014 New Revision: 263979 URL: http://svnweb.freebsd.org/changeset/base/263979 Log: Import ruby19. head/contrib/ruby19/enc/utf_8.c Shouldn't this have been head/contrib/ruby? None of the other contrib directories encode the version number. I'm not sure this is an official policy, since the binary installs as /usr/bin/ruby. I did a quick search, but didn't find anything either. But, down the road when someone upgrades to ruby 2.0, we now have head/contrib/ruby20 or a svn mv ruby19 to head/contrib/ruby. Fair enough. Although the binary could be renamed easily in the Makefile. Either way, would you mind submitting a diff against the current revision to do the rename, if I cannot get to it sooner? Glen pgpMo_wAfZfV4.pgp Description: PGP signature
svn commit: r263981 - head/sys/arm/samsung/exynos
Author: br
Date: Tue Apr 1 04:40:08 2014
New Revision: 263981
URL: http://svnweb.freebsd.org/changeset/base/263981
Log:
Release i2c bus on detach.
Modified:
head/sys/arm/samsung/exynos/chrome_ec.c
Modified: head/sys/arm/samsung/exynos/chrome_ec.c
==
--- head/sys/arm/samsung/exynos/chrome_ec.c Tue Apr 1 00:19:13 2014
(r263980)
+++ head/sys/arm/samsung/exynos/chrome_ec.c Tue Apr 1 04:40:08 2014
(r263981)
@@ -234,9 +234,22 @@ ec_attach(device_t dev)
return (0);
}
+static int
+ec_detach(device_t dev)
+{
+ struct ec_softc *sc;
+
+ sc = device_get_softc(dev);
+
+ bus_release(sc);
+
+ return (0);
+}
+
static device_method_t ec_methods[] = {
DEVMETHOD(device_probe, ec_probe),
DEVMETHOD(device_attach,ec_attach),
+ DEVMETHOD(device_detach,ec_detach),
{ 0, 0 }
};
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r263982 - in head/sys/arm: arm include
Author: br
Date: Tue Apr 1 04:56:40 2014
New Revision: 263982
URL: http://svnweb.freebsd.org/changeset/base/263982
Log:
Add Cortex-A15 cpu id revisions.
Modified:
head/sys/arm/arm/cpufunc.c
head/sys/arm/arm/identcpu.c
head/sys/arm/include/armreg.h
Modified: head/sys/arm/arm/cpufunc.c
==
--- head/sys/arm/arm/cpufunc.c Tue Apr 1 04:40:08 2014(r263981)
+++ head/sys/arm/arm/cpufunc.c Tue Apr 1 04:56:40 2014(r263982)
@@ -1056,7 +1056,10 @@ set_cpufuncs()
cputype == CPU_ID_CORTEXA9R1 ||
cputype == CPU_ID_CORTEXA9R2 ||
cputype == CPU_ID_CORTEXA9R3 ||
- cputype == CPU_ID_CORTEXA15 ||
+ cputype == CPU_ID_CORTEXA15R0 ||
+ cputype == CPU_ID_CORTEXA15R1 ||
+ cputype == CPU_ID_CORTEXA15R2 ||
+ cputype == CPU_ID_CORTEXA15R3 ||
cputype == CPU_ID_KRAIT ) {
cpufuncs = cortexa_cpufuncs;
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
Modified: head/sys/arm/arm/identcpu.c
==
--- head/sys/arm/arm/identcpu.c Tue Apr 1 04:40:08 2014(r263981)
+++ head/sys/arm/arm/identcpu.c Tue Apr 1 04:56:40 2014(r263982)
@@ -185,7 +185,13 @@ const struct cpuidtab cpuids[] = {
generic_steppings },
{ CPU_ID_CORTEXA9R3,CPU_CLASS_CORTEXA, Cortex A9-r3,
generic_steppings },
- { CPU_ID_CORTEXA15, CPU_CLASS_CORTEXA, Cortex A15,
+ { CPU_ID_CORTEXA15R0, CPU_CLASS_CORTEXA, Cortex A15-r0,
+ generic_steppings },
+ { CPU_ID_CORTEXA15R1, CPU_CLASS_CORTEXA, Cortex A15-r1,
+ generic_steppings },
+ { CPU_ID_CORTEXA15R2, CPU_CLASS_CORTEXA, Cortex A15-r2,
+ generic_steppings },
+ { CPU_ID_CORTEXA15R3, CPU_CLASS_CORTEXA, Cortex A15-r3,
generic_steppings },
{ CPU_ID_KRAIT, CPU_CLASS_KRAIT,Krait,
generic_steppings },
Modified: head/sys/arm/include/armreg.h
==
--- head/sys/arm/include/armreg.h Tue Apr 1 04:40:08 2014
(r263981)
+++ head/sys/arm/include/armreg.h Tue Apr 1 04:56:40 2014
(r263982)
@@ -123,7 +123,10 @@
#define CPU_ID_CORTEXA9R1 0x411fc090
#define CPU_ID_CORTEXA9R2 0x412fc090
#define CPU_ID_CORTEXA9R3 0x413fc090
-#define CPU_ID_CORTEXA15 0x410fc0f0
+#define CPU_ID_CORTEXA15R0 0x410fc0f0
+#define CPU_ID_CORTEXA15R1 0x411fc0f0
+#define CPU_ID_CORTEXA15R2 0x412fc0f0
+#define CPU_ID_CORTEXA15R3 0x413fc0f0
#defineCPU_ID_KRAIT0x510f06f0 /* Snapdragon S4 Pro/APQ8064
*/
#defineCPU_ID_TI925T 0x54029250
#define CPU_ID_MV88FR131 0x56251310 /* Marvell Feroceon 88FR131 Core */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
