[Glibc-bsd-commits] r3227 - in trunk/kfreebsd-8/debian: . patches

Petr Salinger ps-guest at alioth.debian.org
Tue Jan 11 08:18:29 UTC 2011 

Author: ps-guest
Date: 2011-01-11 08:18:28 +0000 (Tue, 11 Jan 2011)
New Revision: 3227

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
   trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
   trunk/kfreebsd-8/debian/patches/series
   trunk/kfreebsd-8/debian/rules
Log:
resync remaining diffs - 105_apm_amd64.diff, 907_cpu_class.diff



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-01-10 21:13:39 UTC (rev 3226)
+++ trunk/kfreebsd-8/debian/changelog	2011-01-11 08:18:28 UTC (rev 3227)
@@ -7,7 +7,9 @@
     - 004_xargs.diff: Resync.
     - 102_POLL_HUP.diff: Remove (merged).
     - 104_linprocfs.diff: Remove (merged).
+    - 105_apm_amd64.diff: Resync.
     - 904_dev_full.diff: Resync.
+    - 907_cpu_class.diff: Resync. 
     - 999_firmware.diff: Resync.
 
  -- Robert Millan <rmh at debian.org>  Mon, 10 Jan 2011 16:27:34 +0100

Modified: trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff	2011-01-10 21:13:39 UTC (rev 3226)
+++ trunk/kfreebsd-8/debian/patches/105_apm_amd64.diff	2011-01-11 08:18:28 UTC (rev 3227)
@@ -1,41 +1,32 @@
 --- a/sys/dev/acpica/acpi.c
 +++ b/sys/dev/acpica/acpi.c
-@@ -2308,9 +2308,8 @@
- int
+@@ -2315,9 +2315,7 @@
  acpi_ReqSleepState(struct acpi_softc *sc, int state)
  {
+ #if defined(__amd64__) || defined(__i386__)
 -#if defined(__i386__)
-+#if defined(__amd64__) || defined(__i386__)
      struct apm_clone_data *clone;
 -#endif
+     ACPI_STATUS status;
  
      if (state < ACPI_STATE_S1 || state > ACPI_S_STATES_MAX)
- 	return (EINVAL);
-@@ -2325,7 +2324,6 @@
- 	    return (ENXIO);
-     }
+@@ -2342,7 +2340,6 @@
  
--#if defined(__amd64__) || defined(__i386__)
-     /* If a suspend request is already in progress, just return. */
-     ACPI_LOCK(acpi);
-     if (sc->acpi_next_sstate != 0) {
-@@ -2335,7 +2333,6 @@
- 
      /* Record the pending state and notify all apm devices. */
      sc->acpi_next_sstate = state;
 -#if defined(__i386__)
      STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
  	clone->notify_status = APM_EV_NONE;
  	if ((clone->flags & ACPI_EVF_DEVD) == 0) {
-@@ -2343,7 +2340,6 @@
- 	    KNOTE_UNLOCKED(&clone->sel_read.si_note, 0);
+@@ -2350,7 +2347,6 @@
+ 	    KNOTE_LOCKED(&clone->sel_read.si_note, 0);
  	}
      }
 -#endif
  
      /* If devd(8) is not running, immediately enter the sleep state. */
      if (!devctl_process_running()) {
-@@ -2414,7 +2410,6 @@
+@@ -2418,7 +2414,6 @@
       * are writable since read-only devices couldn't ack the request.
       */
      sleeping = TRUE;
@@ -43,7 +34,7 @@
      clone->notify_status = APM_EV_ACKED;
      STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) {
  	if ((clone->flags & ACPI_EVF_WRITE) != 0 &&
-@@ -2423,7 +2418,6 @@
+@@ -2427,7 +2422,6 @@
  	    break;
  	}
      }
@@ -74,7 +65,7 @@
  struct apm_event_info {
 --- a/sys/amd64/acpica/acpi_machdep.c
 +++ b/sys/amd64/acpica/acpi_machdep.c
-@@ -43,6 +43,24 @@
+@@ -44,6 +44,24 @@
  
  #include <machine/nexusvar.h>
  
@@ -99,14 +90,14 @@
  SYSCTL_DECL(_debug_acpi);
  
  int acpi_resume_beep;
-@@ -54,8 +72,433 @@
+@@ -55,7 +73,432 @@
  TUNABLE_INT("hw.acpi.reset_video", &acpi_reset_video);
  
  static int intr_model = ACPI_INTR_PIC;
 -static struct apm_clone_data acpi_clone;
 +static int apm_active;
 +static struct clonedevs *apm_clones;
- 
++
 +MALLOC_DEFINE(M_APMDEV, "apmdev", "APM device emulation");
 +
 +static d_open_t		apmopen;
@@ -530,11 +521,10 @@
 +	ACPI_UNLOCK(acpi);
 +	return (sleeping);
 +}
-+
+ 
  int
  acpi_machdep_init(device_t dev)
- {
-@@ -63,14 +506,11 @@
+@@ -64,14 +507,12 @@
  
  	sc = devclass_get_softc(devclass_find("acpi"), 0);
  
@@ -550,10 +540,11 @@
 +	sc->acpi_clone = apm_create_clone(sc->acpi_dev_t, sc);
 +	clone_setup(&apm_clones);
 +	EVENTHANDLER_REGISTER(dev_clone, apm_clone, 0, 1000);
- 	acpi_install_wakeup_handler(sc);
++	acpi_install_wakeup_handler(sc);
  
  	if (intr_model != ACPI_INTR_PIC)
---- a/sys/amd64/include/apm_bios.h
+ 		acpi_SetIntrModel(intr_model);
+--- /dev/null
 +++ b/sys/amd64/include/apm_bios.h
 @@ -0,0 +1,264 @@
 +/*-
@@ -820,4 +811,3 @@
 +#endif /* !ASSEMBLER && !INITIALIZER */
 +
 +#endif /* !_MACHINE_APM_BIOS_H_ */
-

Modified: trunk/kfreebsd-8/debian/patches/907_cpu_class.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/907_cpu_class.diff	2011-01-10 21:13:39 UTC (rev 3226)
+++ trunk/kfreebsd-8/debian/patches/907_cpu_class.diff	2011-01-11 08:18:28 UTC (rev 3227)
@@ -8,10 +8,10 @@
  	case CPUCLASS_486:
  		printf("486");
 +		machine[1] = '4';
- 		bzero_vector = i486_bzero;
  		break;
  #endif
-@@ -644,6 +645,7 @@
+ #if defined(I586_CPU)
+@@ -643,6 +644,7 @@
  		       (intmax_t)(tsc_freq + 4999) / 1000000,
  		       (u_int)((tsc_freq + 4999) / 10000) % 100);
  		printf("586");
@@ -19,7 +19,7 @@
  		break;
  #endif
  #if defined(I686_CPU)
-@@ -653,6 +655,7 @@
+@@ -652,6 +654,7 @@
  		       (intmax_t)(tsc_freq + 4999) / 1000000,
  		       (u_int)((tsc_freq + 4999) / 10000) % 100);
  		printf("686");
@@ -27,3 +27,14 @@
  		break;
  #endif
  	default:
+--- a/sys/amd64/amd64/identcpu.c
++++ b/sys/amd64/amd64/identcpu.c
+@@ -85,7 +85,7 @@
+ sysctl_hw_machine(SYSCTL_HANDLER_ARGS)
+ {
+ #ifdef SCTL_MASK32
+-	static const char machine32[] = "i386";
++	static const char machine32[] = "i686";
+ #endif
+ 	int error;
+ 

Modified: trunk/kfreebsd-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-01-10 21:13:39 UTC (rev 3226)
+++ trunk/kfreebsd-8/debian/patches/series	2011-01-11 08:18:28 UTC (rev 3227)
@@ -9,7 +9,7 @@
 020_linker.diff 
 021_superpages_i386.diff
 103_stat_pipe.diff
-#105_apm_amd64.diff
+105_apm_amd64.diff
 106_teken_op.diff
 107_mount_update.diff
 108_teken_utf8_table.diff
@@ -17,7 +17,7 @@
 903_disable_non-free_drivers.diff 
 904_dev_full.diff
 906_grow_sysv_ipc_limits.diff
-#907_cpu_class.diff
+907_cpu_class.diff
 908_linprocfs_is_not_proc.diff
 910_GENERIC_hints.diff
 912_binutils.diff

Modified: trunk/kfreebsd-8/debian/rules
===================================================================
--- trunk/kfreebsd-8/debian/rules	2011-01-10 21:13:39 UTC (rev 3226)
+++ trunk/kfreebsd-8/debian/rules	2011-01-11 08:18:28 UTC (rev 3227)
@@ -17,10 +17,11 @@
 config_files	:= $(wildcard debian/arch/$(cpu)/*.config)
 flavours	:= $(config_files:debian/arch/$(cpu)/%.config=%)
 configfile	:= DEBCUSTOM
-abiname		:= 1
+abiname		:= 0
 
 #SVN		:= http://svn.freebsd.org/base/release/$(version).0
-SVN		:= http://svn.freebsd.org/base/stable/8
+SVN		:= http://svn.freebsd.org/base/releng/$(version)
+#SVN		:= http://svn.freebsd.org/base/stable/$(major)
 SOURCE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-source-$(version)
 IMAGE_PACKAGE	:= $(CURDIR)/debian/kfreebsd-image-$(version)-$(abiname)
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-headers-$(version)-$(abiname)

More information about the Glibc-bsd-commits mailing list